From 319fec47f0e32208f949bf26b61e2099e020846a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 12:43:21 +0000 Subject: [PATCH 001/240] preheat: improve target temperature threshold MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use 5°C threshold to be consistant with other parts of the firmware. Relying on 95% of the target temperature creates a dependency on the temperature: PLA: Target = 215°C, threshold = 10.75°C PETG: Target = 230°C, threshold = 11.5°C ABS: Target = 255°C, threshold = 12.75°C ASA: Target =260°C, threshold = 13.0°C PC: Target = 275°C, threshold = 13.75°C My proposal is we instead use a constant TEMP_HYSTERESIS = 5, which is consistent with M109, and behavior when restoring print from RAM and some of the MMU code (like unload function) Change in memory: Flash: +2 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d2acf60cc..771d6a5e4 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1888,7 +1888,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_timeoutToStatus.stop(); - if (current_temperature[0] > (target_temperature[0] * 0.95)) + if (fabs(current_temperature[0] - target_temperature[0]) > TEMP_HYSTERESIS) { switch (eFilamentAction) { From 6ad126ef0b95451126affde73fa76399f461564d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 13:21:30 +0000 Subject: [PATCH 002/240] optimisation: preheat menu always uses integers for target temperature Let's drop the float comparison since it not needed Change in memory: Flash : -16 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 771d6a5e4..e3df9c00f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1888,7 +1888,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_timeoutToStatus.stop(); - if (fabs(current_temperature[0] - target_temperature[0]) > TEMP_HYSTERESIS) + if (abs((int)current_temperature[0] - nTemp) > TEMP_HYSTERESIS) { switch (eFilamentAction) { From 496b52b819f6909d16246a3a13dbd30f2c95595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 13:23:31 +0000 Subject: [PATCH 003/240] preheat: sync temperature threshold in M600 and Wizard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * M600 used 1°C threshold, which may increase the waiting time a bit * Wizard used 3°C Sync both to use TEMP_HYSTERESIS for consistancy No change in memory footprint --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4d56adfbd..b1bb1afe4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -11424,7 +11424,7 @@ void M600_wait_for_user(float HotendTempBckp) { } break; case 2: //waiting for nozzle to reach target temperature - if (fabs(degTargetHotend(active_extruder) - degHotend(active_extruder)) < 1) { + if (fabs(degTargetHotend(active_extruder) - degHotend(active_extruder)) < TEMP_HYSTERESIS) { lcd_display_message_fullscreen_P(_T(MSG_PRESS_TO_UNLOAD)); waiting_start_time = _millis(); wait_for_user_state = 0; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e3df9c00f..f4a92daa3 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3772,7 +3772,7 @@ static void wait_preheat() plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60); delay_keep_alive(2000); lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); - while (fabs(degHotend(0) - degTargetHotend(0)) > 3) { + while (fabs(degHotend(0) - degTargetHotend(0)) > TEMP_HYSTERESIS) { lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); lcd_set_cursor(0, 4); From d48725480605b9b1fbbfc19f3b146545eefabb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 1 Mar 2023 22:28:08 +0000 Subject: [PATCH 004/240] planner: calculate step difference once Change in memory: Flash:-158 bytes SRAM: 0 bytes --- Firmware/planner.cpp | 73 +++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 81e7cfbb7..af3a8bdb7 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -825,9 +825,16 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate target[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); #endif // ENABLE_MESH_BED_LEVELING target[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]); + + // Calculate subtraction to re-use result in many places + // This saves memory and speeds up calculations + int32_t de = target[E_AXIS] - position[E_AXIS]; + int32_t dx = target[X_AXIS] - position[X_AXIS]; + int32_t dy = target[Y_AXIS] - position[Y_AXIS]; + int32_t dz = target[Z_AXIS] - position[Z_AXIS]; #ifdef PREVENT_DANGEROUS_EXTRUDE - if(target[E_AXIS]!=position[E_AXIS]) + if(de) { if((int)degHotend(active_extruder)cs.axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH) + if(labs(de) > cs.axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH) { position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part #ifdef LIN_ADVANCE position_float[E_AXIS] = e; #endif + de = 0; // no difference SERIAL_ECHO_START; SERIAL_ECHOLNRPGM(_n(" too long extrusion prevented"));////MSG_ERR_LONG_EXTRUDE_STOP } @@ -856,16 +865,16 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // Number of steps for each axis #ifndef COREXY // default non-h-bot planning -block->steps_x.wide = labs(target[X_AXIS]-position[X_AXIS]); -block->steps_y.wide = labs(target[Y_AXIS]-position[Y_AXIS]); +block->steps_x.wide = labs(dx); +block->steps_y.wide = labs(dy); #else // corexy planning // these equations follow the form of the dA and dB equations on http://www.corexy.com/theory.html -block->steps_x.wide = labs((target[X_AXIS]-position[X_AXIS]) + (target[Y_AXIS]-position[Y_AXIS])); -block->steps_y.wide = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-position[Y_AXIS])); +block->steps_x.wide = labs(dx + dy); +block->steps_y.wide = labs(dx - dy); #endif - block->steps_z.wide = labs(target[Z_AXIS]-position[Z_AXIS]); - block->steps_e.wide = labs(target[E_AXIS]-position[E_AXIS]); + block->steps_z.wide = labs(dz); + block->steps_e.wide = labs(de); block->step_event_count.wide = max(block->steps_x.wide, max(block->steps_y.wide, max(block->steps_z.wide, block->steps_e.wide))); // Bail if this is a zero-length block @@ -879,35 +888,17 @@ block->steps_y.wide = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-p block->fan_speed = fanSpeed; - // Compute direction bits for this block + // Compute direction bits for this block block->direction_bits = 0; #ifndef COREXY - if (target[X_AXIS] < position[X_AXIS]) - { - block->direction_bits |= (1<direction_bits |= (1<direction_bits |= _BV(X_AXIS); + if (dy < 0) block->direction_bits |= _BV(Y_AXIS); #else - if ((target[X_AXIS]-position[X_AXIS]) + (target[Y_AXIS]-position[Y_AXIS]) < 0) - { - block->direction_bits |= (1<direction_bits |= (1<direction_bits |= _BV(X_AXIS); + if (dx - dy < 0) block->direction_bits |= _BV(Y_AXIS); #endif - if (target[Z_AXIS] < position[Z_AXIS]) - { - block->direction_bits |= (1<direction_bits |= (1<direction_bits |= _BV(Z_AXIS); + if (de < 0) block->direction_bits |= _BV(E_AXIS); //enable active axes #ifdef COREXY @@ -941,17 +932,17 @@ Having the real displacement of the head, we can calculate the total movement le */ #ifndef COREXY float delta_mm[4]; - delta_mm[X_AXIS] = (target[X_AXIS]-position[X_AXIS])/cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_AXIS] = (target[Y_AXIS]-position[Y_AXIS])/cs.axis_steps_per_unit[Y_AXIS]; + delta_mm[X_AXIS] = dx / cs.axis_steps_per_unit[X_AXIS]; + delta_mm[Y_AXIS] = dy / cs.axis_steps_per_unit[Y_AXIS]; #else float delta_mm[6]; - delta_mm[X_HEAD] = (target[X_AXIS]-position[X_AXIS])/cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_HEAD] = (target[Y_AXIS]-position[Y_AXIS])/cs.axis_steps_per_unit[Y_AXIS]; - delta_mm[X_AXIS] = ((target[X_AXIS]-position[X_AXIS]) + (target[Y_AXIS]-position[Y_AXIS]))/cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_AXIS] = ((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-position[Y_AXIS]))/cs.axis_steps_per_unit[Y_AXIS]; + delta_mm[X_HEAD] = dx / cs.axis_steps_per_unit[X_AXIS]; + delta_mm[Y_HEAD] = dy / cs.axis_steps_per_unit[Y_AXIS]; + delta_mm[X_AXIS] = (dx + dy) / cs.axis_steps_per_unit[X_AXIS]; + delta_mm[Y_AXIS] = (dx - dy) / cs.axis_steps_per_unit[Y_AXIS]; #endif - delta_mm[Z_AXIS] = (target[Z_AXIS]-position[Z_AXIS])/cs.axis_steps_per_unit[Z_AXIS]; - delta_mm[E_AXIS] = (target[E_AXIS]-position[E_AXIS])/cs.axis_steps_per_unit[E_AXIS]; + delta_mm[Z_AXIS] = dz / cs.axis_steps_per_unit[Z_AXIS]; + delta_mm[E_AXIS] = de / cs.axis_steps_per_unit[E_AXIS]; if ( block->steps_x.wide <=dropsegments && block->steps_y.wide <=dropsegments && block->steps_z.wide <=dropsegments ) { block->millimeters = fabs(delta_mm[E_AXIS]); From bc818636b0ecea3f3265e76310fce51605b82731 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 2 Mar 2023 12:29:25 +0100 Subject: [PATCH 005/240] Increase MMU FW version to 2.1.8 in relation to MMU-218 --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_supported_version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 2101fdd10..525bd78df 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -259,7 +259,7 @@ static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detecte static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU unit."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.7."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.8."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); diff --git a/Firmware/mmu2_supported_version.h b/Firmware/mmu2_supported_version.h index d228323ff..0cd2c9f53 100644 --- a/Firmware/mmu2_supported_version.h +++ b/Firmware/mmu2_supported_version.h @@ -5,6 +5,6 @@ namespace MMU2 { static constexpr uint8_t mmuVersionMajor = 2; static constexpr uint8_t mmuVersionMinor = 1; -static constexpr uint8_t mmuVersionPatch = 7; +static constexpr uint8_t mmuVersionPatch = 8; } // namespace MMU2 From 0b261ad4ded69f9feddc5deeea7beb04d0eeee36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 3 Mar 2023 21:11:16 +0000 Subject: [PATCH 006/240] remove duplicate function in planner moves_planned() should be used instead No change in memory --- Firmware/Marlin_main.cpp | 9 +-------- Firmware/planner.cpp | 4 ---- Firmware/planner.h | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b1bb1afe4..a85dbf0eb 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10984,9 +10984,6 @@ void restore_print_from_eeprom(bool mbl_was_active) { void stop_and_save_print_to_ram(float z_move, float e_move) { if (saved_printing) return; -#if 0 - unsigned char nplanner_blocks; -#endif unsigned char nlines; uint16_t sdlen_planner; uint16_t sdlen_cmdqueue; @@ -10994,16 +10991,12 @@ void stop_and_save_print_to_ram(float z_move, float e_move) cli(); if (card.sdprinting) { -#if 0 - nplanner_blocks = number_of_blocks(); -#endif saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner saved_sdpos -= sdlen_planner; sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue saved_sdpos -= sdlen_cmdqueue; saved_printing_type = PRINTING_TYPE_SD; - } else if (usb_timer.running()) { //reuse saved_sdpos for storing line number saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue @@ -11023,7 +11016,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) SERIAL_ECHOPGM("SDPOS="); MYSERIAL.println(card.get_sdpos(), DEC); SERIAL_ECHOPGM("SDLEN_PLAN="); MYSERIAL.println(sdlen_planner, DEC); SERIAL_ECHOPGM("SDLEN_CMDQ="); MYSERIAL.println(sdlen_cmdqueue, DEC); - SERIAL_ECHOPGM("PLANNERBLOCKS="); MYSERIAL.println(int(nplanner_blocks), DEC); + SERIAL_ECHOPGM("PLANNERBLOCKS="); MYSERIAL.println(int(moves_planned()), DEC); SERIAL_ECHOPGM("SDSAVED="); MYSERIAL.println(saved_sdpos, DEC); //SERIAL_ECHOPGM("SDFILELEN="); MYSERIAL.println(card.fileSize(), DEC); diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index af3a8bdb7..e22f82860 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -1411,10 +1411,6 @@ void update_mode_profile() } #endif //TMC2130 -uint8_t number_of_blocks() -{ - return (block_buffer_head + BLOCK_BUFFER_SIZE - block_buffer_tail) & (BLOCK_BUFFER_SIZE - 1); -} #ifdef PLANNER_DIAGNOSTICS uint8_t planner_queue_min() { diff --git a/Firmware/planner.h b/Firmware/planner.h index 27664aefa..ef15be6e3 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -274,8 +274,6 @@ void reset_acceleration_rates(); void update_mode_profile(); -uint8_t number_of_blocks(); - // #define PLANNER_DIAGNOSTICS #ifdef PLANNER_DIAGNOSTICS // Diagnostic functions to display planner buffer underflow on the display. From a20a7232a818ab9a9c4b76bc15d615cf24c51605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 28 Feb 2023 20:49:35 +0000 Subject: [PATCH 007/240] Change "Extruder N" to "Filament N" Change in memory: Flash: -52 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- Firmware/Tcodes.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b1bb1afe4..9413e7017 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3469,7 +3469,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) { slot = SpoolJoin::spooljoin.nextSlot(); } else { // Only ask for the slot if automatic/SpoolJoin is off - slot = choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)); + slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)); } setTargetHotend(nozzle_temp); diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp index 30ea49c7b..c9a7f7238 100644 --- a/Firmware/Tcodes.cpp +++ b/Firmware/Tcodes.cpp @@ -29,11 +29,7 @@ struct SChooseFromMenu { }; SChooseFromMenu TCodeChooseFromMenu() { - if (MMU2::mmu2.Enabled()) { - return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), true ); - } else { - return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)), false ); - } + return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), MMU2::mmu2.Enabled() ); } void TCodes(char *const strchr_pointer, uint8_t codeValue) { @@ -48,7 +44,7 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) { } else if (strchr_pointer[index] == 'x'){ // load to extruder gears; if mmu is not present do nothing if (MMU2::mmu2.Enabled()) { - MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER))); + MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT))); } } else if (strchr_pointer[index] == 'c'){ // load from extruder gears to nozzle (nozzle should be preheated) From e787111922b361b7c2fc7411df936381d7e8a7f4 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 8 Mar 2023 15:42:25 +0100 Subject: [PATCH 008/240] Add MMU error code: MCU_UNDERVOLTAGE_VCC (#4069) + read bandgap voltage periodically + correct wording of ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC (as requested in Prusa-Error-Codes PR#81) --- Firmware/mmu2/error_codes.h | 2 ++ Firmware/mmu2/errors_list.h | 10 +++++++++- Firmware/mmu2_error_converter.cpp | 3 +++ Firmware/mmu2_protocol_logic.cpp | 1 + Firmware/mmu2_protocol_logic.h | 4 ++-- Firmware/mmu2_supported_version.h | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Firmware/mmu2/error_codes.h b/Firmware/mmu2/error_codes.h index 130e3beeb..971f36bb8 100644 --- a/Firmware/mmu2/error_codes.h +++ b/Firmware/mmu2/error_codes.h @@ -56,6 +56,8 @@ enum class ErrorCode : uint_fast16_t { FILAMENT_EJECTED = 0x800c, ///< Filament was ejected, waiting for user input - technically, this is not an error + MCU_UNDERVOLTAGE_VCC = 0x800d, ///< MCU VCC rail undervoltage. + LOAD_TO_EXTRUDER_FAILED = 0x802a, ///< E32811 internal error of the printer - try-load-unload sequence detected missing filament -> failed load into the nozzle QUEUE_FULL = 0x802b, ///< E32811 internal logic error - attempt to move with a full queue VERSION_MISMATCH = 0x802c, ///< E32812 internal error of the printer - incompatible version of the MMU FW diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 525bd78df..b51b89cba 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -62,6 +62,8 @@ typedef enum : uint16_t { ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED = 315, ERR_ELECTRICAL_IDLER_SELFTEST_FAILED = 325, + ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC = 306, + ERR_CONNECT = 400, ERR_CONNECT_MMU_NOT_RESPONDING = 401, ERR_CONNECT_COMMUNICATION_ERROR = 402, @@ -117,6 +119,7 @@ static const constexpr uint16_t errorCodes[] PROGMEM = { ERR_ELECTRICAL_PULLEY_SELFTEST_FAILED, ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED, ERR_ELECTRICAL_IDLER_SELFTEST_FAILED, + ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC, ERR_CONNECT_MMU_NOT_RESPONDING, ERR_CONNECT_COMMUNICATION_ERROR, ERR_SYSTEM_FILAMENT_ALREADY_LOADED, @@ -160,6 +163,7 @@ static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRI //static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); //static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); static const char MSG_TITLE_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); ////MSG_TITLE_SELFTEST_FAILED c=20 +static const char MSG_TITLE_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MCU UNDERVOLTAGE VCC"); ////MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 static const char MSG_TITLE_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU NOT RESPONDING"); ////MSG_TITLE_MMU_NOT_RESPONDING c=20 static const char MSG_TITLE_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("COMMUNICATION ERROR"); ////MSG_TITLE_COMMUNICATION_ERROR c=20 static const char MSG_TITLE_FIL_ALREADY_LOADED[] PROGMEM_I1 = ISTR("FILAMENT ALREADY LOA"); ////MSG_TITLE_FIL_ALREADY_LOADED c=20 @@ -204,6 +208,7 @@ static const char * const errorTitles [] PROGMEM = { _R(MSG_TITLE_SELFTEST_FAILED), _R(MSG_TITLE_SELFTEST_FAILED), _R(MSG_TITLE_SELFTEST_FAILED), + _R(MSG_TITLE_MCU_UNDERVOLTAGE_VCC), _R(MSG_TITLE_MMU_NOT_RESPONDING), _R(MSG_TITLE_COMMUNICATION_ERROR), _R(MSG_TITLE_FIL_ALREADY_LOADED), @@ -249,6 +254,7 @@ static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); //// //static const char MSG_DESC_PULLEY_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Pulley TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU unit not responding. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU unit not responding correctly. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 static const char MSG_DESC_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("Cannot perform the action, filament is already loaded. Unload it first."); ////MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 @@ -259,7 +265,7 @@ static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detecte static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU unit."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.8."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); @@ -300,6 +306,7 @@ static const char * const errorDescs[] PROGMEM = { _R(MSG_DESC_TMC), // descPULLEY_SELFTEST_FAILED _R(MSG_DESC_TMC), // descSELECTOR_SELFTEST_FAILED _R(MSG_DESC_TMC), // descIDLER_SELFTEST_FAILED + _R(MSG_DESC_TMC), // descMSG_DESC_MCU_UNDERVOLTAGE_VCC _R(MSG_DESC_MMU_NOT_RESPONDING), _R(MSG_DESC_COMMUNICATION_ERROR), _R(MSG_DESC_FILAMENT_ALREADY_LOADED), @@ -381,6 +388,7 @@ static const uint8_t errorButtons[] PROGMEM = { Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_SELFTEST_FAILED Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_SELFTEST_FAILED Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_SELFTEST_FAILED + Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//MCU_UNDERVOLTAGE_VCC Btns(ButtonOperations::RestartMMU, ButtonOperations::DisableMMU),//MMU_NOT_RESPONDING Btns(ButtonOperations::RestartMMU, ButtonOperations::DisableMMU),//COMMUNICATION_ERROR diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 3bf4ed649..15c66bb83 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -84,6 +84,8 @@ uint8_t PrusaErrorCodeIndex(uint16_t ec) { return FindErrorIndex(ERR_SYSTEM_FW_RUNTIME_ERROR); case (uint16_t)ErrorCode::FINDA_VS_EEPROM_DISREPANCY: return FindErrorIndex(ERR_SYSTEM_UNLOAD_MANUALLY); + case (uint16_t)ErrorCode::MCU_UNDERVOLTAGE_VCC: + return FindErrorIndex(ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC); } // Electrical issues which can be detected somehow. @@ -265,6 +267,7 @@ Buttons ButtonAvailable(uint16_t ec) { case ERR_SYSTEM_QUEUE_FULL: case ERR_SYSTEM_FW_RUNTIME_ERROR: + case ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC: switch (buttonSelectedOperation) { case ButtonOperations::RestartMMU: // "Restart MMU" return RestartMMU; diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 9c91776a0..58f34a31d 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -35,6 +35,7 @@ const uint8_t ProtocolLogic::regs8Addrs[ProtocolLogic::regs8Count] PROGMEM = { const uint8_t ProtocolLogic::regs16Addrs[ProtocolLogic::regs16Count] PROGMEM = { 4, // MMU errors - aka statistics 0x1a, // Pulley position [mm] + 0x21, // MCU bandgap voltage }; const uint8_t ProtocolLogic::initRegs8Addrs[ProtocolLogic::initRegs8Count] PROGMEM = { diff --git a/Firmware/mmu2_protocol_logic.h b/Firmware/mmu2_protocol_logic.h index 53ec0002a..b7128806b 100644 --- a/Firmware/mmu2_protocol_logic.h +++ b/Firmware/mmu2_protocol_logic.h @@ -365,10 +365,10 @@ private: uint8_t regs8[regs8Count] = { 0, 0, 0 }; // 16bit registers - static constexpr uint8_t regs16Count = 2; + static constexpr uint8_t regs16Count = 3; static_assert(regs16Count > 0); // code is not ready for empty lists of registers static const uint8_t regs16Addrs[regs16Count] PROGMEM; - uint16_t regs16[regs16Count] = { 0, 0 }; + uint16_t regs16[regs16Count] = { 0, 0, 0 }; // 8bit init values to be sent to the MMU after line up static constexpr uint8_t initRegs8Count = 2; diff --git a/Firmware/mmu2_supported_version.h b/Firmware/mmu2_supported_version.h index 0cd2c9f53..26683174b 100644 --- a/Firmware/mmu2_supported_version.h +++ b/Firmware/mmu2_supported_version.h @@ -5,6 +5,6 @@ namespace MMU2 { static constexpr uint8_t mmuVersionMajor = 2; static constexpr uint8_t mmuVersionMinor = 1; -static constexpr uint8_t mmuVersionPatch = 8; +static constexpr uint8_t mmuVersionPatch = 9; } // namespace MMU2 From ba41b2bb0bd64bc3a6819f983970a1ec11179ca9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 07:00:40 +0100 Subject: [PATCH 009/240] Fix M706 lcd message stuck --- Firmware/mmu2.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index ffe6a9a52..7a1be0457 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -451,6 +451,7 @@ bool MMU2::cut_filament(uint8_t slot, bool enableFullScreenMsg /*= true*/) { extruder = MMU2_NO_TOOL; tool_change_extruder = MMU2_NO_TOOL; MakeSound(SoundType::Confirm); + ScreenUpdateEnable(); return true; } From 04d440a9c8154b40de30fed1d373aefc5ec53035 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 14:23:56 +0100 Subject: [PATCH 010/240] Fix AutoLoad filament menu not shown when FSensor is [Off] (#4072) Fix AutoLoad filament menu not shown when FSensor if [Off] --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b7d212b42..27cf48cbe 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5428,7 +5428,7 @@ static void lcd_main_menu() #endif //MMU_HAS_CUTTER } else { #ifdef FILAMENT_SENSOR - if (fsensor.getAutoLoadEnabled()) { + if (fsensor.isEnabled() && fsensor.getAutoLoadEnabled()) { MENU_ITEM_SUBMENU_P(_i("AutoLoad filament"), lcd_menu_AutoLoadFilament);////MSG_AUTOLOAD_FILAMENT c=18 } else From bbfc4b9f7853525d36a74e09ffc14366bcd9edbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 5 Mar 2023 11:17:21 +0000 Subject: [PATCH 011/240] PFW-1504 initial commit Change in memory: Flash: +162 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 21 ++++++++++++++++++--- Firmware/mmu2/variants/config_MMU2.h | 5 +++++ Firmware/mmu2/variants/config_MMU2S.h | 5 +++++ Firmware/mmu2_marlin1.cpp | 2 +- Firmware/mmu2_reporting.cpp | 5 +++++ Firmware/mmu2_reporting.h | 2 ++ Firmware/ultralcd.cpp | 10 ++++++++++ Firmware/ultralcd.h | 2 ++ 8 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 7a1be0457..e6c17c48a 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -239,15 +239,30 @@ bool MMU2::VerifyFilamentEnteredPTFE() { return false; uint8_t fsensorState = 0; + uint8_t fsensorStateLCD = 0; + uint8_t fsensor_pixel = 0; // MMU has finished its load, push the filament further by some defined constant length // If the filament sensor reads 0 at any moment, then report FAILURE - MoveE(MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - (logic.ExtraLoadDistance() - MMU2_FILAMENT_SENSOR_POSITION), MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); - MoveE(-(MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - (logic.ExtraLoadDistance() - MMU2_FILAMENT_SENSOR_POSITION)), MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); + + const float delta_mm = MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH - logic.ExtraLoadDistance(); + const float length_step_mm = 2 * (delta_mm) / (LCD_WIDTH + 1); + // reset current position to whatever the planner thinks it is + float last_position = planner_get_machine_position_E_mm(); + MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); + MoveE(-delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); while (planner_any_moves()) { // Wait for move to finish and monitor the fsensor the entire time // A single 0 reading will set the bit. - fsensorState |= (WhereIsFilament() == FilamentState::NOT_PRESENT); + fsensorStateLCD |= (WhereIsFilament() == FilamentState::NOT_PRESENT); + fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR + + if ((fabs(planner_get_machine_position_E_mm() - last_position)) > length_step_mm) { + if (fsensor_pixel > 19) fsensor_pixel = 19; + TryLoadUnloadProgressbar(fsensor_pixel++, 3, fsensorStateLCD); + fsensorStateLCD = 0; // Clear temporary bit + last_position = planner_get_machine_position_E_mm(); // Reset + } safe_delay_keep_alive(0); } diff --git a/Firmware/mmu2/variants/config_MMU2.h b/Firmware/mmu2/variants/config_MMU2.h index a2e4b70fa..31ac838b1 100644 --- a/Firmware/mmu2/variants/config_MMU2.h +++ b/Firmware/mmu2/variants/config_MMU2.h @@ -40,6 +40,11 @@ static constexpr float MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK = -5.F; // mm used to sh static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_LENGTH = 80.0f; // mm static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE = 80.0f; // mm/s +// After loading a new filament, the printer will extrude the filament by this distance +// and then retract it back to the original position. This is used to check if the +// filament sensor reading flickers or filament is jammed. +static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - MMU2_FILAMENT_SENSOR_POSITION; + static constexpr uint8_t MMU2_NO_TOOL = 99; static constexpr uint32_t MMU_BAUD = 115200; diff --git a/Firmware/mmu2/variants/config_MMU2S.h b/Firmware/mmu2/variants/config_MMU2S.h index 71f7f801c..c5166cf55 100644 --- a/Firmware/mmu2/variants/config_MMU2S.h +++ b/Firmware/mmu2/variants/config_MMU2S.h @@ -40,6 +40,11 @@ static constexpr float MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK = -5.F; // mm used to sh static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_LENGTH = 80.0f; // mm static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE = 80.0f; // mm/s +// After loading a new filament, the printer will extrude the filament by this distance +// and then retract it back to the original position. This is used to check if the +// filament sensor reading flickers or filament is jammed. +static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - MMU2_FILAMENT_SENSOR_POSITION; + static constexpr uint8_t MMU2_NO_TOOL = 99; static constexpr uint32_t MMU_BAUD = 115200; diff --git a/Firmware/mmu2_marlin1.cpp b/Firmware/mmu2_marlin1.cpp index df08bdcb4..87853d516 100644 --- a/Firmware/mmu2_marlin1.cpp +++ b/Firmware/mmu2_marlin1.cpp @@ -27,7 +27,7 @@ bool planner_any_moves() { } float planner_get_machine_position_E_mm(){ - return current_position[E_AXIS]; + return st_get_position_mm(E_AXIS); } float planner_get_current_position_E(){ diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 9ca27eedf..2a23044fb 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -289,6 +289,11 @@ void ReportProgressHook(CommandInProgress cip, uint16_t ec) { } } +void TryLoadUnloadProgressbar(uint8_t column, uint8_t row, bool sensorState) { + lcd_putc_at(column, row, sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); // Place character + lcd_reset_status_message_timeout(); +} + void IncrementLoadFails(){ eeprom_increment_byte((uint8_t *)EEPROM_MMU_LOAD_FAIL); eeprom_increment_word((uint16_t *)EEPROM_MMU_LOAD_FAIL_TOT); diff --git a/Firmware/mmu2_reporting.h b/Firmware/mmu2_reporting.h index a5fd49aa0..fe38ce385 100644 --- a/Firmware/mmu2_reporting.h +++ b/Firmware/mmu2_reporting.h @@ -32,6 +32,8 @@ void ReportErrorHook(CommandInProgress cip, uint16_t ec, uint8_t es); /// Called when the MMU sends operation progress update void ReportProgressHook(CommandInProgress cip, uint16_t ec); +void TryLoadUnloadProgressbar(uint8_t column, uint8_t row, bool sensorState); + /// Remders the sensor status line. Also used by the "resume temperature" screen. void ReportErrorHookDynamicRender(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 27cf48cbe..dbd4715ae 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -562,6 +562,11 @@ void lcdui_print_status_line(void) { scrollstuff = 0; } } else { // Otherwise check for other special events + if (!lcd_status_message_timeout.expired_cont(LCD_STATUS_DELAYED_TIMEOUT)) + { + return; // Nothing to do, waiting for delay to expire + } + switch (custom_message_type) { case CustomMsg::M117: // M117 Set the status line message on the LCD case CustomMsg::Status: // Nothing special, print status message normally @@ -7398,6 +7403,11 @@ void lcd_setstatus_serial(const char* message) SERIAL_ECHOLN(message); } +void lcd_reset_status_message_timeout() +{ + lcd_status_message_timeout.start(); +} + void lcd_setalertstatus_(const char* message, uint8_t severity, bool progmem) { if (lcd_message_check(severity)) { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 8450a041b..b398f6a91 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -17,11 +17,13 @@ void ultralcd_init(); #define LCD_STATUS_NONE 0 //< No alert message set #define LCD_STATUS_INFO_TIMEOUT 20000 +#define LCD_STATUS_DELAYED_TIMEOUT 4000 // Set the current status message (equivalent to LCD_STATUS_NONE) void lcd_setstatus(const char* message); void lcd_setstatuspgm(const char* message); void lcd_setstatus_serial(const char* message); +void lcd_reset_status_message_timeout(); //! return to the main status screen and display the alert message //! Beware - it has sideeffects: From 51f1aa14a5540f64620b65d742f1d9ba92cb0930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 11 Mar 2023 15:48:25 +0000 Subject: [PATCH 012/240] PFW-1504 Update last position as quickly as possible 0.1mm extrusion may happen while updating the LCD No change in memory --- Firmware/mmu2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index e6c17c48a..d3474993e 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -246,8 +246,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { const float delta_mm = MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH - logic.ExtraLoadDistance(); const float length_step_mm = 2 * (delta_mm) / (LCD_WIDTH + 1); - // reset current position to whatever the planner thinks it is float last_position = planner_get_machine_position_E_mm(); + MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); MoveE(-delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); @@ -258,10 +258,10 @@ bool MMU2::VerifyFilamentEnteredPTFE() { fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR if ((fabs(planner_get_machine_position_E_mm() - last_position)) > length_step_mm) { + last_position = planner_get_machine_position_E_mm(); // Reset if (fsensor_pixel > 19) fsensor_pixel = 19; TryLoadUnloadProgressbar(fsensor_pixel++, 3, fsensorStateLCD); fsensorStateLCD = 0; // Clear temporary bit - last_position = planner_get_machine_position_E_mm(); // Reset } safe_delay_keep_alive(0); } From 73c76579afcc3dbad7cfc25abbd955ff3d95969a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 11 Mar 2023 16:03:57 +0000 Subject: [PATCH 013/240] PFW-1504 Add init for progress bar In case we are running a retry, the firmware should clear the old rendering before starting on a new one Change in memory: Flash: +6 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 6 +++--- Firmware/mmu2_reporting.cpp | 13 +++++++++++-- Firmware/mmu2_reporting.h | 7 ++++++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index d3474993e..5eb607e30 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -240,7 +240,6 @@ bool MMU2::VerifyFilamentEnteredPTFE() { uint8_t fsensorState = 0; uint8_t fsensorStateLCD = 0; - uint8_t fsensor_pixel = 0; // MMU has finished its load, push the filament further by some defined constant length // If the filament sensor reads 0 at any moment, then report FAILURE @@ -248,6 +247,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { const float length_step_mm = 2 * (delta_mm) / (LCD_WIDTH + 1); float last_position = planner_get_machine_position_E_mm(); + TryLoadUnloadProgressbarInit(); + MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); MoveE(-delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); @@ -259,8 +260,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { if ((fabs(planner_get_machine_position_E_mm() - last_position)) > length_step_mm) { last_position = planner_get_machine_position_E_mm(); // Reset - if (fsensor_pixel > 19) fsensor_pixel = 19; - TryLoadUnloadProgressbar(fsensor_pixel++, 3, fsensorStateLCD); + TryLoadUnloadProgressbar(fsensorStateLCD); fsensorStateLCD = 0; // Clear temporary bit } safe_delay_keep_alive(0); diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 2a23044fb..647211134 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -289,8 +289,17 @@ void ReportProgressHook(CommandInProgress cip, uint16_t ec) { } } -void TryLoadUnloadProgressbar(uint8_t column, uint8_t row, bool sensorState) { - lcd_putc_at(column, row, sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); // Place character +void TryLoadUnloadProgressbarInit() { + // Clear the status line + lcd_set_cursor(0, 3); + lcd_space(LCD_WIDTH); + + // Reset cursor position + lcd_set_cursor(0, 3); +} + +void TryLoadUnloadProgressbar(bool sensorState) { + lcd_putc(sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); // Place character lcd_reset_status_message_timeout(); } diff --git a/Firmware/mmu2_reporting.h b/Firmware/mmu2_reporting.h index fe38ce385..3d5dcff58 100644 --- a/Firmware/mmu2_reporting.h +++ b/Firmware/mmu2_reporting.h @@ -32,7 +32,12 @@ void ReportErrorHook(CommandInProgress cip, uint16_t ec, uint8_t es); /// Called when the MMU sends operation progress update void ReportProgressHook(CommandInProgress cip, uint16_t ec); -void TryLoadUnloadProgressbar(uint8_t column, uint8_t row, bool sensorState); +/// @brief Clear the status line and setup the LCD cursor +void TryLoadUnloadProgressbarInit(); + +/// @brief Add one block to the progress bar +/// @param sensorState if true, filament is not present, else filament is present. This controls which character to render +void TryLoadUnloadProgressbar(bool sensorState); /// Remders the sensor status line. Also used by the "resume temperature" screen. void ReportErrorHookDynamicRender(); From 9145c8f59f3c7ba7b7e5326fe7125110f5193130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 11 Mar 2023 16:22:53 +0000 Subject: [PATCH 014/240] PFW-1504 too much? I'm not happy with the current solution, I think we can improve it by using the fact that this is a triangle wave. Need to think about it. --- Firmware/mmu2.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 5eb607e30..46da201ac 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -249,6 +249,25 @@ bool MMU2::VerifyFilamentEnteredPTFE() { TryLoadUnloadProgressbarInit(); + /* The position is basically a triangle wave + // current position is not zero, so it is an offset + // y(x) + // ▲ + // │ + // │ ^◄────────── delta_mm - current_position + // │ / \ + // │ / \ + // │ / \ + // machine │ / \ + // position (mm)│ / \ + // │ / \ + // │ / \ + // │/ \◄───────current_position + // └───────────────────► x + // 0 19 + // pixel # + */ + MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); MoveE(-delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); From 690d83a94a0ff3dc55e289ba2935cbcb51236f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 11 Mar 2023 21:26:51 +0000 Subject: [PATCH 015/240] fixup --- Firmware/mmu2.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 46da201ac..b3a9096ec 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -249,23 +249,19 @@ bool MMU2::VerifyFilamentEnteredPTFE() { TryLoadUnloadProgressbarInit(); - /* The position is basically a triangle wave - // current position is not zero, so it is an offset + /* The position is a triangle wave + // current position is not zero, it is an offset // y(x) // ▲ - // │ - // │ ^◄────────── delta_mm - current_position - // │ / \ - // │ / \ - // │ / \ - // machine │ / \ - // position (mm)│ / \ - // │ / \ - // │ / \ - // │/ \◄───────current_position - // └───────────────────► x - // 0 19 - // pixel # + // │ ^◄────────── delta_mm + current_position + // machine │ / \ + // position │ / \ + // (mm) │ / \ + // │ / \ + // │/ \◄───────current_position + // └──────────────► x + // 0 19 + // pixel # */ MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); From 59e1ac0396292caa6e403e4e9361294e9154bdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 09:45:09 +0000 Subject: [PATCH 016/240] PFW-1504 implement stepper_get_machine_position_E_mm() This function should be used when reading the current machine position while a move is ongoing No change in memory --- Firmware/mmu2.cpp | 6 +++--- Firmware/mmu2_marlin.h | 1 + Firmware/mmu2_marlin1.cpp | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index b3a9096ec..1d4e69eb4 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -245,7 +245,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { const float delta_mm = MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH - logic.ExtraLoadDistance(); const float length_step_mm = 2 * (delta_mm) / (LCD_WIDTH + 1); - float last_position = planner_get_machine_position_E_mm(); + float last_position = stepper_get_machine_position_E_mm(); TryLoadUnloadProgressbarInit(); @@ -273,8 +273,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { fsensorStateLCD |= (WhereIsFilament() == FilamentState::NOT_PRESENT); fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR - if ((fabs(planner_get_machine_position_E_mm() - last_position)) > length_step_mm) { - last_position = planner_get_machine_position_E_mm(); // Reset + if ((fabs(stepper_get_machine_position_E_mm() - last_position)) > length_step_mm) { + last_position = stepper_get_machine_position_E_mm(); // Reset TryLoadUnloadProgressbar(fsensorStateLCD); fsensorStateLCD = 0; // Clear temporary bit } diff --git a/Firmware/mmu2_marlin.h b/Firmware/mmu2_marlin.h index 89ab2753f..9d35c4c0c 100644 --- a/Firmware/mmu2_marlin.h +++ b/Firmware/mmu2_marlin.h @@ -29,6 +29,7 @@ float MoveRaiseZ(float delta); void planner_synchronize(); bool planner_any_moves(); float planner_get_machine_position_E_mm(); +float stepper_get_machine_position_E_mm(); float planner_get_current_position_E(); void planner_set_current_position_E(float e); void planner_line_to_current_position(float feedRate_mm_s); diff --git a/Firmware/mmu2_marlin1.cpp b/Firmware/mmu2_marlin1.cpp index 87853d516..07f3c01b5 100644 --- a/Firmware/mmu2_marlin1.cpp +++ b/Firmware/mmu2_marlin1.cpp @@ -27,6 +27,10 @@ bool planner_any_moves() { } float planner_get_machine_position_E_mm(){ + return current_position[E_AXIS]; +} + +float stepper_get_machine_position_E_mm(){ return st_get_position_mm(E_AXIS); } From c518bfdb73a318a4508353bb463fe380769d259b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 10:53:25 +0000 Subject: [PATCH 017/240] PFW-1504 Set cursor position each time to be safe Change in memory: Flash: +18 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 4 +++- Firmware/mmu2_reporting.cpp | 6 ++++-- Firmware/mmu2_reporting.h | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 1d4e69eb4..ad6a28ba1 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -240,6 +240,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { uint8_t fsensorState = 0; uint8_t fsensorStateLCD = 0; + uint8_t pixel = 0; // MMU has finished its load, push the filament further by some defined constant length // If the filament sensor reads 0 at any moment, then report FAILURE @@ -275,7 +276,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { if ((fabs(stepper_get_machine_position_E_mm() - last_position)) > length_step_mm) { last_position = stepper_get_machine_position_E_mm(); // Reset - TryLoadUnloadProgressbar(fsensorStateLCD); + if (pixel > (LCD_WIDTH - 1)) pixel = LCD_WIDTH - 1; + TryLoadUnloadProgressbar(pixel++, fsensorStateLCD); fsensorStateLCD = 0; // Clear temporary bit } safe_delay_keep_alive(0); diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 647211134..54d7e4fba 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -298,8 +298,10 @@ void TryLoadUnloadProgressbarInit() { lcd_set_cursor(0, 3); } -void TryLoadUnloadProgressbar(bool sensorState) { - lcd_putc(sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); // Place character +void TryLoadUnloadProgressbar(uint8_t col, bool sensorState) { + // Set the cursor position each time in case some other + // part of the firmware changes the cursor position + lcd_putc_at(col, 3, sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); lcd_reset_status_message_timeout(); } diff --git a/Firmware/mmu2_reporting.h b/Firmware/mmu2_reporting.h index 3d5dcff58..8bfa2c978 100644 --- a/Firmware/mmu2_reporting.h +++ b/Firmware/mmu2_reporting.h @@ -36,8 +36,9 @@ void ReportProgressHook(CommandInProgress cip, uint16_t ec); void TryLoadUnloadProgressbarInit(); /// @brief Add one block to the progress bar +/// @param col pixel position on the LCD status line, should range from 0 to (LCD_WIDTH - 1) /// @param sensorState if true, filament is not present, else filament is present. This controls which character to render -void TryLoadUnloadProgressbar(bool sensorState); +void TryLoadUnloadProgressbar(uint8_t col, bool sensorState); /// Remders the sensor status line. Also used by the "resume temperature" screen. void ReportErrorHookDynamicRender(); From f2157c6f1d63d4210f5194bdc38a19c1a2c115ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 10:56:06 +0000 Subject: [PATCH 018/240] Fixup We're always setting the cursor position when rendering now Saves 8 bytes of flash --- Firmware/mmu2_reporting.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 54d7e4fba..46d2c97aa 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -293,15 +293,12 @@ void TryLoadUnloadProgressbarInit() { // Clear the status line lcd_set_cursor(0, 3); lcd_space(LCD_WIDTH); - - // Reset cursor position - lcd_set_cursor(0, 3); } void TryLoadUnloadProgressbar(uint8_t col, bool sensorState) { // Set the cursor position each time in case some other // part of the firmware changes the cursor position - lcd_putc_at(col, 3, sensorState ? '_' : LCD_STR_SOLID_BLOCK[0]); + lcd_putc_at(col, 3, sensorState ? '-' : LCD_STR_SOLID_BLOCK[0]); lcd_reset_status_message_timeout(); } From 9865d4a38a622ec12b7648193efc9347fe809270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 13:01:41 +0000 Subject: [PATCH 019/240] PFW-1504 Add precision error This fixes an issue where sometimes not all 20 pixels are rendered. It is better to render 1 too many pixels (sometimes), rather than rendering too few. Change in memory: Flash: +18 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index ad6a28ba1..7e604f738 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -245,7 +245,17 @@ bool MMU2::VerifyFilamentEnteredPTFE() { // If the filament sensor reads 0 at any moment, then report FAILURE const float delta_mm = MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH - logic.ExtraLoadDistance(); - const float length_step_mm = 2 * (delta_mm) / (LCD_WIDTH + 1); + + // Allow some error in each pixel step. It is better to render too many pixels + // rather than too few. Note that 0.25mm is not enough but 0.50mm seems to work + // 0.50mm gives 1 digit precision + static constexpr float float_precision = 0.50; // mm + + // The total length is twice delta_mm. Divide that length by number of pixels + // available to get length per pixel. + // Finally subtract the step length by the precision set above to allow some + // error introduced by CPU execution delays + const float length_step_mm = ( (2 * delta_mm) / LCD_WIDTH) - float_precision; float last_position = stepper_get_machine_position_E_mm(); TryLoadUnloadProgressbarInit(); @@ -274,8 +284,10 @@ bool MMU2::VerifyFilamentEnteredPTFE() { fsensorStateLCD |= (WhereIsFilament() == FilamentState::NOT_PRESENT); fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR - if ((fabs(stepper_get_machine_position_E_mm() - last_position)) > length_step_mm) { - last_position = stepper_get_machine_position_E_mm(); // Reset + // Fetch the position once, to ensure last_position will be correct + float current_mm = stepper_get_machine_position_E_mm(); + if (fabs(current_mm - last_position) > length_step_mm) { + last_position = current_mm; if (pixel > (LCD_WIDTH - 1)) pixel = LCD_WIDTH - 1; TryLoadUnloadProgressbar(pixel++, fsensorStateLCD); fsensorStateLCD = 0; // Clear temporary bit From b5e323e67c6b5303a0e7040db96289af4093cbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 13:18:17 +0000 Subject: [PATCH 020/240] PFW-1504 rename length_step_mm to mm_per_pixel Its more descriptive --- Firmware/mmu2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 7e604f738..f6f23b1e5 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -255,7 +255,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { // available to get length per pixel. // Finally subtract the step length by the precision set above to allow some // error introduced by CPU execution delays - const float length_step_mm = ( (2 * delta_mm) / LCD_WIDTH) - float_precision; + const float mm_per_pixel = ( (2 * delta_mm) / LCD_WIDTH) - float_precision; float last_position = stepper_get_machine_position_E_mm(); TryLoadUnloadProgressbarInit(); @@ -286,7 +286,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { // Fetch the position once, to ensure last_position will be correct float current_mm = stepper_get_machine_position_E_mm(); - if (fabs(current_mm - last_position) > length_step_mm) { + if (fabs(current_mm - last_position) > mm_per_pixel) { last_position = current_mm; if (pixel > (LCD_WIDTH - 1)) pixel = LCD_WIDTH - 1; TryLoadUnloadProgressbar(pixel++, fsensorStateLCD); From 42878341af9776083f8552972d48fe1497d35fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 15:40:55 +0000 Subject: [PATCH 021/240] PFW-1504 More correct solution to the pixel count issue The fact that the relationship between machine position and pixel index is not linear means we cannot simply rely on comparing the previous position to the next machine position. i.e derivative of E_AXIS Because around the max amplitude of the triangle wave the slope will suddenly change sign and will create a deadzone which has width 2*mm_per_pixel. For MMU2S this is ~10mm (or two pixels). Instead we should split the moves. And only plan the 2nd move once we're at the top of the triangle wave. That way we don't really care about the position delta. Now we just calculate the current y(x) position relative to current position and divide by mm_per_pixel. If there is a delta measured with unit 'pixel' then that means its time to render the next pixel. This solution seems to work well so far on my end. Change in memory: Flash: +2 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 57 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index f6f23b1e5..ab3a88b08 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -240,33 +240,31 @@ bool MMU2::VerifyFilamentEnteredPTFE() { uint8_t fsensorState = 0; uint8_t fsensorStateLCD = 0; - uint8_t pixel = 0; + uint8_t lcd_cursor_col = 0; // MMU has finished its load, push the filament further by some defined constant length // If the filament sensor reads 0 at any moment, then report FAILURE const float delta_mm = MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH - logic.ExtraLoadDistance(); - // Allow some error in each pixel step. It is better to render too many pixels - // rather than too few. Note that 0.25mm is not enough but 0.50mm seems to work - // 0.50mm gives 1 digit precision - static constexpr float float_precision = 0.50; // mm - // The total length is twice delta_mm. Divide that length by number of pixels // available to get length per pixel. - // Finally subtract the step length by the precision set above to allow some - // error introduced by CPU execution delays - const float mm_per_pixel = ( (2 * delta_mm) / LCD_WIDTH) - float_precision; - float last_position = stepper_get_machine_position_E_mm(); + const float mm_per_pixel = (2 * (delta_mm)) / LCD_WIDTH; TryLoadUnloadProgressbarInit(); /* The position is a triangle wave // current position is not zero, it is an offset + // + // Keep in mind that the relationship between machine position + // and pixel index is not linear. The area around the amplitude + // needs to be taken care of carefully. The current implementation + // handles each move separately so there is no need to watch for the change + // in the slope's sign or check the last machine position. // y(x) // ▲ // │ ^◄────────── delta_mm + current_position // machine │ / \ - // position │ / \ + // position │ / \◄────────── stepper_position_mm + current_position // (mm) │ / \ // │ / \ // │/ \◄───────current_position @@ -275,24 +273,29 @@ bool MMU2::VerifyFilamentEnteredPTFE() { // pixel # */ - MoveE(delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); - MoveE(-delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); + // Pixel index will go from 0 to 10, then back from 10 to 0 + // The change in this number is used to indicate a new pixel + // should be drawn on the display + uint8_t dpixel1 = 0; + uint8_t dpixel0 = 0; + for (uint8_t move = 0; move < 2; move++) { + MoveE(move == 0 ? delta_mm : -delta_mm, MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE); + while (planner_any_moves()) { + // Wait for move to finish and monitor the fsensor the entire time + // A single 0 reading will set the bit. + fsensorStateLCD |= (WhereIsFilament() == FilamentState::NOT_PRESENT); + fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR - while (planner_any_moves()) { - // Wait for move to finish and monitor the fsensor the entire time - // A single 0 reading will set the bit. - fsensorStateLCD |= (WhereIsFilament() == FilamentState::NOT_PRESENT); - fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR - - // Fetch the position once, to ensure last_position will be correct - float current_mm = stepper_get_machine_position_E_mm(); - if (fabs(current_mm - last_position) > mm_per_pixel) { - last_position = current_mm; - if (pixel > (LCD_WIDTH - 1)) pixel = LCD_WIDTH - 1; - TryLoadUnloadProgressbar(pixel++, fsensorStateLCD); - fsensorStateLCD = 0; // Clear temporary bit + // Always round up, you can only have 'whole' pixels. (floor is also an option) + dpixel1 = ceil((stepper_get_machine_position_E_mm() - planner_get_current_position_E()) / mm_per_pixel); + if (dpixel1 - dpixel0) { + dpixel0 = dpixel1; + if (lcd_cursor_col > (LCD_WIDTH - 1)) lcd_cursor_col = LCD_WIDTH - 1; + TryLoadUnloadProgressbar(lcd_cursor_col++, fsensorStateLCD); + fsensorStateLCD = 0; // Clear temporary bit + } + safe_delay_keep_alive(0); } - safe_delay_keep_alive(0); } if (fsensorState) { From ebf94c572f117fe2e5a294c31e7460fd8d1f0022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 16:05:35 +0000 Subject: [PATCH 022/240] PFW-1504 Minor optimisation Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index ab3a88b08..46ed0d664 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -248,7 +248,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { // The total length is twice delta_mm. Divide that length by number of pixels // available to get length per pixel. - const float mm_per_pixel = (2 * (delta_mm)) / LCD_WIDTH; + // Note: Below is the reciprocal of (2 * delta_mm) / LCD_WIDTH [mm/pixel] + const float pixel_per_mm = 0.5f * float(LCD_WIDTH) / (delta_mm); TryLoadUnloadProgressbarInit(); @@ -287,7 +288,7 @@ bool MMU2::VerifyFilamentEnteredPTFE() { fsensorState |= fsensorStateLCD; // No need to do the above comparison twice, just bitwise OR // Always round up, you can only have 'whole' pixels. (floor is also an option) - dpixel1 = ceil((stepper_get_machine_position_E_mm() - planner_get_current_position_E()) / mm_per_pixel); + dpixel1 = ceil((stepper_get_machine_position_E_mm() - planner_get_current_position_E()) * pixel_per_mm); if (dpixel1 - dpixel0) { dpixel0 = dpixel1; if (lcd_cursor_col > (LCD_WIDTH - 1)) lcd_cursor_col = LCD_WIDTH - 1; From 1ea85f04531f20f02df1bb0f7d45cf5b8eedd109 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 08:49:04 +0100 Subject: [PATCH 023/240] Shorten translations --- lang/po/Firmware_cs.po | 120 +++++++------- lang/po/Firmware_de.po | 359 +++++++++++++++++++---------------------- lang/po/Firmware_es.po | 91 +++++------ lang/po/Firmware_fr.po | 177 ++++++++++---------- lang/po/Firmware_it.po | 65 ++++---- lang/po/Firmware_pl.po | 176 ++++++++++---------- 6 files changed, 468 insertions(+), 520 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index d8ddbfea8..ddd577fcd 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -4,16 +4,16 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:38 AM CET\n" -"PO-Revision-Date: Wed 16 Mar 2022 09:24:38 AM CET\n" +"PO-Revision-Date: 2023-02-23 13:20+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 @@ -107,8 +107,7 @@ msgstr "AutoZavedeni fil." msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" -"Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte " -"filament..." +"Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament." #. MSG_PROGRESS_AVOID_GRIND c=20 #: ../../Firmware/mmu2_progress_converter.cpp:16 @@ -190,7 +189,7 @@ msgstr "Test remenu" #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" -msgstr "Detekovan vypadek proudu.Obnovit tisk?" +msgstr "Detekovan vypadek proudu. Obnovit tisk?" #. MSG_BRIGHT c=6 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 @@ -398,8 +397,8 @@ msgid "" "be turned on only in\n" "Normal mode" msgstr "" -"Crash detekce muze\n" -"byt zapnuta pouze v\n" +"Crash detekce\n" +"funguje pouze v\n" "Normal modu" #. MSG_CUT_FILAMENT c=17 @@ -449,8 +448,8 @@ msgid "" "Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" -"Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim " -"podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." +"Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte podle " +"manualu, kapitola Zaciname." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 @@ -499,11 +498,11 @@ msgstr "ERR: Cekam na uziv." msgid "ERROR:" msgstr "CHYBA:" -#. MSG_EJECT_FROM_MMU c=16 +#. MSG_EJECT_FILAMENT c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject from MMU" -msgstr "Vysunout z MMU" +msgid "Eject filament" +msgstr "Vysunout fil." #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate @@ -816,8 +815,7 @@ msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"G-code je pripraven pro jinou verzi. Prosim preslicujte model znovu. Tisk " -"zrusen." +"G-code je pripraven pro jinou verzi. Vyslicujte model znovu. Tisk zrusen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 @@ -832,22 +830,20 @@ msgid "" "G-code sliced for a different printer type. Please re-slice the model again. " "Print cancelled." msgstr "" -"G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. " -"Tisk zrusen." +"G-code je pripraven pro jiny typ tiskarny. Vyslicujte model znovu. Tisk " +"zrusen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:370 msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code je pripraven pro novejsi firmware.Pokracovat?" +msgstr "G-code je pripraven pro novejsi FW. Pokracovat?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/util.cpp:377 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." -msgstr "" -"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk " -"zrusen." +msgstr "G-code je pripraven pro novejsi FW. Aktualizujte FW. Tisk zrusen." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -956,8 +952,8 @@ msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." msgstr "" -"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni " -"- Tiskove platy" +"Vice tiskovych platu? Kalibrujte je v menu Nastaveni - HW nastaveni - " +"Tiskove platy" #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2530 @@ -992,8 +988,8 @@ msgid "" "Internal runtime error. Try resetting the MMU unit or updating the firmware. " "If the issue persists, contact support." msgstr "" -"Interní chyba běhu. Zkuste resetovat MMU nebo aktualizujte firmware. Pokud " -"chyba pretrvava, kontakujte tech. podporu" +"Interní chyba. Zkuste resetovat MMU ci aktualizujte FW. Pokud pretrvava, " +"kontakujte tech. podporu." #. MSG_FILAMENT_LOADED c=20 r=2 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 @@ -1166,7 +1162,7 @@ msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU jednotka neodpovida. Zkontrolujte kabely a jejich zapojeni. Pokud potize " +"MMU neodpovida. Zkontrolujte kabely a jejich zapojeni. Pokud potize " "pretrvavaji, kontaktujte podporu." #. MSG_MMU_CONNECTED c=18 @@ -1294,7 +1290,7 @@ msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 #: ../../Firmware/util.cpp:199 msgid "New firmware version available:" -msgstr "Vysla nova verze firmware:" +msgstr "Vysla nova verze FW:" #. MSG_NO c=4 #: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 @@ -1507,13 +1503,13 @@ msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" -"Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte " -"Pruvodce restartovanim tiskarny." +"Nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce " +"restartovanim tiskarny." #. MSG_CHECK_IR_CONNECTION c=20 r=4 #: ../../Firmware/ultralcd.cpp:6240 msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" +msgstr "Zkontrolujte zapojeni IR senzoru a vyjmuty filament" #. MSG_SELFTEST_PLEASECHECK c=20 #: ../../Firmware/ultralcd.cpp:6944 @@ -1523,20 +1519,18 @@ msgstr "Zkontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 #: ../../Firmware/ultralcd.cpp:4099 msgid "Please clean heatbed and then press the knob." -msgstr "Prosim ocistete podlozku a stisknete tlacitko." +msgstr "Ocistete podlozku a stisknete tlacitko." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." -msgstr "" -"Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." +msgstr "Pro uspesnou kalibraci ocistete trysku. Potvrdte tlacitkem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 #: ../../Firmware/ultralcd.cpp:3904 msgid "" "Please insert filament into the extruder, then press the knob to load it." -msgstr "" -"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" +msgstr "Vlozte filament do extruderu a stiskem tlacitka jej zavedete." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 #: ../../Firmware/ultralcd.cpp:3901 @@ -1544,46 +1538,45 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho " -"zavedeni" +"Vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni." #. MSG_PLEASE_LOAD_PLA c=20 r=4 #: ../../Firmware/ultralcd.cpp:3824 msgid "Please load filament first." -msgstr "Prosim nejdriv zavedte filament" +msgstr "Nejdriv zavedte filament" #. MSG_CHECK_IDLER c=20 r=5 #: ../../Firmware/Marlin_main.cpp:3578 msgid "Please open idler and remove filament manually." -msgstr "Prosim otevrete idler a manualne odstrante filament." +msgstr "Otevrete idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 #: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:4041 msgid "Please place steel sheet on heatbed." -msgstr "Umistete prosim tiskovy plat na podlozku" +msgstr "Umistete tiskovy plat na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" -msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" +msgstr "Pro vysunuti filamentu stisknete tlacitko" #. MSG_PULL_OUT_FILAMENT c=20 r=4 #: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 msgid "Please pull out filament immediately" -msgstr "Prosim vyjmete urychlene filament" +msgstr "Vyjmete urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 #: ../../Firmware/ultralcd.cpp:4036 msgid "Please remove shipping helpers first." -msgstr "Nejprve prosim sundejte transportni soucastky." +msgstr "Nejprve sundejte transportni soucastky." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." -msgstr "Odstrante prosim tiskovy plat z podlozky." +msgstr "Odstrante tiskovy plat z podlozky." #. MSG_RUN_XYZ c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4894 @@ -1593,7 +1586,7 @@ msgstr "Nejprve spustte kalibraci XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 #: ../../Firmware/ultralcd.cpp:6237 msgid "Please unload the filament first, then repeat this action." -msgstr "Prosim vyjmete filament a zopakujte tuto akci" +msgstr "Vyjmete filament a zopakujte tuto akci" #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 #: ../../Firmware/util.cpp:203 @@ -1605,7 +1598,7 @@ msgstr "Prosim aktualizujte." #: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" -msgstr "Prosim cekejte" +msgstr "Cekejte" #. MSG_POWER_FAILURES c=15 #: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 @@ -1627,7 +1620,7 @@ msgstr "Predehrejte trysku!" #: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 #: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 msgid "Preheating nozzle. Please wait." -msgstr "Predehrev trysky. Prosim cekejte." +msgstr "Predehrev trysky. Vyckejte." #. MSG_PREHEATING_TO_CUT c=20 #: ../../Firmware/ultralcd.cpp:1994 @@ -1702,8 +1695,8 @@ msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First " "steps, section Calibration flow." msgstr "" -"Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, " -"kapitola Zaciname, odstavec Postup kalibrace." +"Tiskarna nebyla jeste zkalibrovana. Postupujte podle manualu, kapitola " +"Zaciname." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1713,11 +1706,11 @@ msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" -"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. " -"Tisk zrusen." +"Prumer trysky tiskarny se lisi od G-code. Zkontrolujte nastaveni. Tisk " +"zrusen." #. MSG_DESC_PULLEY_STALLED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 @@ -1768,8 +1761,8 @@ msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"Pozadovany filament nastroj neni k dispozici na tomto HW. V G-Codu se " -"nachazi nastrojovy index mimo rozsah (T0-T4)." +"Pozadovany fil. nastroj neni k dispozici na tomto HW. V G-Codu se nachazi " +"nastrojovy index mimo rozsah (T0-T4)." #. MSG_RESET c=14 #: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 @@ -2132,8 +2125,12 @@ msgstr "TMC CHYBA NIZKE NAP." #. 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 "Kalibrace termálního modelu trvá asi 12 minut. Viz\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Kalibrace termálního modelu trvá asi 12 minut. Viz\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2169,8 +2166,8 @@ msgid "" "The MMU unit reports its FW version incompatible with the printer's " "firmware. Make sure the MMU firmware is up to date." msgstr "" -"MMU jednotka hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v " -"MMU aktualni firmware." +"MMU hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v MMU " +"aktualni FW." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 @@ -2196,8 +2193,7 @@ msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" -"Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola " -"Zaciname, sekce Postup kalibrace." +"Je potreba kalibrovat osu Z. Postupujte dle prirucky, kapitola Zaciname." #. MSG_SORT_TIME c=8 #: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 @@ -2447,7 +2443,7 @@ msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 #: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Pruvodce muzete kdykoliv znovu spustit z menu Kalibrace -> Pruvodce" +msgstr "Pruvodce muzete znovu spustit z menu Kalibrace -> Pruvodce." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4163 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 2fe47ca47..f5ba6c8d6 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -4,26 +4,26 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:41 AM CET\n" -"PO-Revision-Date: Wed 16 Mar 2022 09:24:41 AM CET\n" +"PO-Revision-Date: 2023-02-19 19:30+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 +#: ../../Firmware/messages.cpp:165 msgid " 0.3 or older" msgstr " 0.3 oder älter" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 +#: ../../Firmware/messages.cpp:164 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" @@ -104,8 +104,7 @@ msgstr "AutoLaden Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 #: ../../Firmware/ultralcd.cpp:2294 -msgid "" -"Autoloading filament is active, just press the knob and insert filament..." +msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" "Automatisches Fila- ment Laden ist aktiv , Knopf drücken und Filament einlegen..." @@ -159,13 +158,11 @@ msgstr "Bett Level Korr." #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 #: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 +#: ../../Firmware/Marlin_main.cpp:2992 ../../Firmware/mesh_bed_calibration.cpp:2858 #: ../../Firmware/mesh_bed_calibration.cpp:2866 #: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 msgid "" -"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " -"reset." +"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset." msgstr "" "Z-Kal. fehlgeschlg. Sensor nicht ausgelöst. Schmutzige Düse? Warte auf Reset." @@ -220,8 +217,8 @@ msgstr "Kalibrierung Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 #: ../../Firmware/ultralcd.cpp:2937 msgid "" -"Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " -"stoppers. Click when done." +"Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. " +"Click when done." msgstr "" "XYZ Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. " "Anschliessend den Knopf drücken." @@ -235,8 +232,8 @@ msgstr "Kalibriere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 #: ../../Firmware/ultralcd.cpp:2936 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end " -"stoppers. Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " +"Click when done." msgstr "" "Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. " "Anschliessend den Knopf drücken." @@ -447,21 +444,17 @@ msgstr "Spannrol. auskuppeln" #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " -"calibration." +"Please follow the manual, chapter First steps, section First layer calibration." msgstr "" "Der Abstand zwischen der Spitze der Düse und dem Bett ist noch nicht " -"eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, " -"Abschnitt Erste Schicht Kalibrierung." +"eingestellt. Folgen Sie dem Handbuch, Kapitel Erste Schritte." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 msgid "" -"Do you want to repeat last step to readjust distance between nozzle and " -"heatbed?" +"Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" -"Möchten Sie den letzten Schritt wiederholen, um den Abstand zwischen Düse " -"und Druckbett neu einzustellen?" +"Willst du den letzten Schritt wiederholen, um den Abstand neu einzustellen?" #. MSG_BTN_CONTINUE c=8 #: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 @@ -502,11 +495,11 @@ msgstr "FEHL. Warte Benutzer" msgid "ERROR:" msgstr "FEHLER:" -#. MSG_EJECT_FROM_MMU c=16 +#. MSG_EJECT_FILAMENT c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject from MMU" -msgstr "Auswerf. aus MMU" +msgid "Eject filament" +msgstr "Filamentauswurf" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate @@ -580,18 +573,17 @@ msgstr "FINDA N. AUSGELÖST" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 msgid "" -"FINDA didn't switch off while unloading filament. Try unloading manually. " -"Ensure filament can move and FINDA works." +"FINDA didn't switch off while unloading filament. Try unloading manually. Ensure " +"filament can move and FINDA works." msgstr "" -"Die FINDA schaltete sich beim Entladen nicht aus. Versuchen Sie, Fil. " -"manuell zu entladen. Überprüfen Sie, dass sich Fil. bewegen kann und die " -"FINDA funktioniert." +"FINDA nicht ausgeschaltet beim Entladen. Fil. manuell entladen. Fil. bewegt " +"sich? FINDA funktioniert?" #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can " -"move and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can move " +"and FINDA works." msgstr "" "FINDA hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, dass " "sich das Filament bewegen kann und FINDA funktioniert." @@ -726,30 +718,29 @@ msgstr "Filamentsensor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 msgid "" -"Filament sensor didn't switch off while unloading filament. Ensure filament " -"can move and the sensor works." +"Filament sensor didn't switch off while unloading filament. Ensure filament can " +"move and the sensor works." msgstr "" -"Der FSensor hat sich beim Entladen des Fil. nicht abgeschaltet. Stellen Sie " -"sicher, dass sich das Fil. bewegen kann und der Sensor funktioniert." +"FSens. beim Entladen nicht abgeschaltet. Sicherstellen: Fil. bewegbar und Sensor " +"funktioniert?" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the filament " +"reached the fsensor and the sensor works." msgstr "" -"Der FSensor hat beim Laden des Filaments nicht ausgelöst. Stellen Sie " -"sicher, dass das Filament den Sensor erreicht hat und der Sensor " -"funktioniert." +"Der FSensor hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, " +"dass das Filament den Sensor erreicht hat und der Sensor funktioniert." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 msgid "" -"Filament sensor triggered too early while loading to extruder. Check there " -"isn't anything stuck in PTFE tube. Check that sensor reads properly." +"Filament sensor triggered too early while loading to extruder. Check there isn't " +"anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Der FSensor wurde beim Laden in den Extruder zu früh ausgelöst. Prüfen Sie, " -"dass nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." +"Der FSensor wurde beim Laden in den Extruder zu früh ausgelöst. Prüfen Sie, dass " +"nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -791,7 +782,7 @@ msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" -"Für Düsenwechsel lesen Sie bitte\n" +"Für Düsenwechsel lesen Sie\n" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 @@ -821,8 +812,8 @@ msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"G-Code ist für einen anderen Level geslict. Bitte slicen Sie das Modell " -"erneut. Druck abgebrochen." +"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. Druck " +"abgebrochen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 @@ -837,8 +828,8 @@ msgid "" "G-code sliced for a different printer type. Please re-slice the model again. " "Print cancelled." msgstr "" -"G-Code ist für einen anderen Drucker geslict. Bitte slicen Sie das Modell " -"erneut. Druck abgebrochen." +"G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut. " +"Druck abgebrochen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:370 @@ -848,11 +839,10 @@ msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/util.cpp:377 msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." msgstr "" -"G-Code ist für eine neuere Firmware geslict. Bitte die Firmware updaten. " -"Druck abgebrochen." +"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. Druck " +"abgebrochen." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -885,22 +875,22 @@ msgstr "Aufwärmen OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 #: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 msgid "" -"Hi, I am your Original Prusa i3 printer. I will guide you through a short " -"setup process, in which the Z-axis will be calibrated. Then, you will be " -"ready to print." +"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup " +"process, in which the Z-axis will be calibrated. Then, you will be ready to " +"print." msgstr "" -"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen " -"kurzen Einrichtungs- prozess führen, bei dem die Z-Achse kalibriert wird. " -"Danach können Sie drucken." +"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen " +"Einrichtungs- prozess führen, bei dem die Z-Achse kalibriert wird. Danach können " +"Sie drucken." #. MSG_WIZARD_WELCOME c=20 r=7 #: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 msgid "" -"Hi, I am your Original Prusa i3 printer. Would you like me to guide you " -"through the setup process?" +"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through " +"the setup process?" msgstr "" -"Hallo, ich bin Ihr Original Prusa i3 Drucker. Möchten Sie, dass ich Sie " -"durch den Einricht- ungsablauf führe?" +"Hallo, ich bin Ihr Original Prusa i3 Drucker. Möchten Sie, dass ich Sie durch " +"den Einricht- ungsablauf führe?" #. MSG_HIGH_POWER c=10 #: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 @@ -930,8 +920,7 @@ msgstr "Hotend-Lüfter:" #: ../../Firmware/ultralcd.cpp:4030 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" -"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 Min." -"dauern." +"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 Min.dauern." #. MSG_WIZARD_Z_CAL c=20 r=8 #: ../../Firmware/ultralcd.cpp:4038 @@ -961,11 +950,11 @@ msgstr "UNGÜLTIGER FIL.PLATZ" #. MSG_ADDITIONAL_SHEETS c=20 r=9 #: ../../Firmware/ultralcd.cpp:4104 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - " -"HW Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - HW " +"Setup - Steel sheets." msgstr "" -"Wenn Sie zusätzliche Stahlbleche haben, kalibrieren Sie deren Vorein- " -"stellungen unter Einstellungen - HW Setup - Stahlbleche." +"Wenn Sie zusätzliche Stahlbleche haben, kalibrieren Sie deren Vorein- stellungen " +"unter Einstellungen - HW Setup - Stahlbleche." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2530 @@ -990,21 +979,19 @@ msgstr "Filament einlegen" #. MSG_INSERT_FIL c=20 r=6 #: ../../Firmware/ultralcd.cpp:6215 msgid "" -"Insert the filament (do not load it) into the extruder and then press the " -"knob." +"Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" -"Stecken Sie das Filament (nicht laden) in den Extruder und drücken Sie dann " -"den Knopf." +"Stecken Sie das Filament (nicht laden) in den Extruder und drücken Sie dann den " +"Knopf." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware. If " +"the issue persists, contact support." msgstr "" -"Interner Laufzeit- fehler. Versuchen Sie, die MMU zurück- zusetzen oder die " -"Firmware zu aktual- isieren. Wenn das Problem weiterhin besteht, wenden Sie " -"sich an den Support." +"Interner Laufzeitfehler. MMU-Einheit zurücksetzen oder Firmware aktualisieren. " +"Ansonsten Support kontaktieren." #. MSG_FILAMENT_LOADED c=20 r=2 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 @@ -1103,8 +1090,8 @@ msgstr "Lade Farbe" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3908 msgid "Loading filament" msgstr "Filament lädt" @@ -1127,7 +1114,7 @@ msgstr "MMU FW UPDATE NÖTIG" #. MSG_DESC_QUEUE_FULL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 msgid "MMU Firmware internal error, please reset the MMU." -msgstr "MMU interner Firmware Fehler, bitte setzen Sie die MMU zurück." +msgstr "MMU Firmware Fehler, setzen Sie die MMU zurück." #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 @@ -1165,21 +1152,20 @@ msgstr "MMU Ladefehler" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." +"MMU unit not responding correctly. Check the wiring and connectors. If the issue " +"persists, contact support." msgstr "" -"MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die " -"Anschlüsse. Wenn das Problem weiterhin besteht, wenden Sie sich an den " -"Support." +"MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die Anschlüsse. " +"Wenn das Problem weiterhin besteht, wenden Sie sich an den Support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " -"persists, contact support." +"MMU unit not responding. Check the wiring and connectors. If the issue persists, " +"contact support." msgstr "" -"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn " -"das Problem weiterhin besteht, wenden Sie sich an den Support." +"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn das " +"Problem weiterhin besteht, wenden Sie sich an den Support." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1672 @@ -1208,8 +1194,8 @@ msgid "Measured skew" msgstr "Schräglauf" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3279 ../../Firmware/mesh_bed_calibration.cpp:2836 +#: ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhöhe des Kalibrierpunktes" @@ -1409,8 +1395,7 @@ msgstr "Aus" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 #: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "" -"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." +msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 @@ -1471,11 +1456,11 @@ msgstr "PINDA-Kalibrierung fehlgeschlagen" #: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 #: ../../Firmware/ultralcd.cpp:3367 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu " -"Settings->PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu Settings-" +">PINDA cal." msgstr "" -"PINDA Kalibrierung ist fertig + aktiv. Es kann ausge- schaltet werden im " -"Menü Einstellungen -> PINDA kal." +"PINDA Kalibrierung ist fertig + aktiv. Es kann ausge- schaltet werden im Menü " +"Einstellungen -> PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 #: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 @@ -1511,8 +1496,8 @@ msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Legen Sie ein Blatt Papier unter die Düse während der Kalibrierung der " -"ersten 4 Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." +"Legen Sie ein Blatt Papier unter die Düse während der Kalibrierung der ersten 4 " +"Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 @@ -1520,95 +1505,91 @@ msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" -"Bitte lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann " -"mit dem Assistenten fort, indem Sie den Drucker neu starten." +"Lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit dem " +"Assistenten fort, indem Sie den Drucker neu starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 #: ../../Firmware/ultralcd.cpp:6240 msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Bitte IR Sensor Verbindungen über- prüfen und Filament entladen ist." +msgstr "IR Sensor Verbindungen über- prüfen. Ist Filament entladen?" #. MSG_SELFTEST_PLEASECHECK c=20 #: ../../Firmware/ultralcd.cpp:6944 msgid "Please check:" -msgstr "Bitte prüfen:" +msgstr "Prüfen:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 #: ../../Firmware/ultralcd.cpp:4099 msgid "Please clean heatbed and then press the knob." -msgstr "Bitte reinigen Sie das Heizbett und drücken Sie dann den Knopf." +msgstr "Reinigen Sie das Heizbett und drücken Sie dann den Knopf." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." -msgstr "" -"Bitte entfernen Sie überstehendes Fil- ament von der Düse. Klicken wenn " -"sauber." +msgstr "Entfernen Sie überstehendes Filament von der Düse. Klicken wenn sauber." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 #: ../../Firmware/ultralcd.cpp:3904 -msgid "" -"Please insert filament into the extruder, then press the knob to load it." +msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "" -"Legen Sie Fil. in den Extruder ein und drücken Sie dann den Knopf,um zu " -"laden." +"Legen Sie Fil. in den Extruder ein und drücken Sie dann den Knopf,um zu laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 #: ../../Firmware/ultralcd.cpp:3901 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob " -"to load it." +"Please insert filament into the first tube of the MMU, then press the knob to " +"load it." msgstr "" -"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und drücken " -"Sie dann den Knopf, um es zu laden." +"Stecken Sie das Filament in den ersten Schlauch der MMU. Drücken Sie dann den " +"Knopf, um es zu laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 #: ../../Firmware/ultralcd.cpp:3824 msgid "Please load filament first." -msgstr "Bitte laden Sie zuerst das Filament." +msgstr "Laden Sie zuerst das Filament." #. MSG_CHECK_IDLER c=20 r=5 #: ../../Firmware/Marlin_main.cpp:3578 msgid "Please open idler and remove filament manually." -msgstr "Bitte Spannrolle öffnen und Filament von Hand entfernen" +msgstr "Spannrolle öffnen und Filament von Hand entfernen" #. MSG_PLACE_STEEL_SHEET c=20 r=5 #: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:4041 msgid "Please place steel sheet on heatbed." -msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." +msgstr "Legen Sie das Stahlblech auf das Heizbett." #. MSG_PRESS_TO_UNLOAD c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" -msgstr "Bitte drücken Sie den Knopf um das Filament zu entladen." +msgstr "Drücken Sie den Knopf um das Filament zu entladen." #. MSG_PULL_OUT_FILAMENT c=20 r=4 #: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 msgid "Please pull out filament immediately" -msgstr "Bitte ziehen Sie das Filament sofort heraus" +msgstr "Ziehen Sie das Filament sofort heraus" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 #: ../../Firmware/ultralcd.cpp:4036 msgid "Please remove shipping helpers first." -msgstr "Bitte zuerst Transportsicherungen entfernen." +msgstr "Zuerst Transportsicherungen entfernen." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." -msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." +msgstr "Entfernen Sie das Stahlblech vom Heizbett." #. MSG_RUN_XYZ c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4894 msgid "Please run XYZ calibration first." -msgstr "Bitte zuerst XYZ Kalibrierung ausführen." +msgstr "Zuerst XYZ Kalibrierung ausführen." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 #: ../../Firmware/ultralcd.cpp:6237 msgid "Please unload the filament first, then repeat this action." -msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." +msgstr "Entladen Sie erst das Filament und versuchen Sie es nochmal." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 #: ../../Firmware/util.cpp:203 @@ -1620,7 +1601,7 @@ msgstr "Bitte aktualisieren." #: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" -msgstr "Bitte warten" +msgstr "Warten" #. MSG_POWER_FAILURES c=15 #: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 @@ -1678,7 +1659,7 @@ msgstr "Knopf drücken zum" #. MSG_PRESS_TO_PREHEAT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11560 msgid "Press the knob to preheat nozzle and continue." -msgstr "Bitte drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." +msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." #. MSG_PRINT_ABORTED c=20 #: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 @@ -1717,8 +1698,8 @@ msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First " "steps, section Calibration flow." msgstr "" -"Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel " -"Erste Schritte, Abschnitt Kalibrierungsablauf." +"Drucker wurde noch nicht kalibriert. Folgen Sie dem Handbuch, Kapitel Erste " +"Schritte." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1728,11 +1709,11 @@ msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" -"Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie " -"den Wert in den Einstellungen. Druck abgebrochen." +"Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie den " +"Wert in den Einstellungen. Druck abgebrochen." #. MSG_DESC_PULLEY_STALLED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 @@ -1771,8 +1752,7 @@ msgstr "Druck wiederherst" #: ../../Firmware/Marlin_main.cpp:3458 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Entfernen Sie das alte Filament und drücken Sie den Knopf, um das neue zu " -"laden." +"Entfernen Sie das alte Filament und drücken Sie den Knopf, um das neue zu laden." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5409 @@ -1782,11 +1762,11 @@ msgstr "Umbenennen" #. MSG_DESC_INVALID_TOOL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 msgid "" -"Requested filament tool is not available on this hardware. Check the G-code " -"for tool index out of range (T0-T4)." +"Requested filament tool is not available on this hardware. Check the G-code for " +"tool index out of range (T0-T4)." msgstr "" -"Der angeforderte Filamentplatz ist auf dieser Hardware nicht verfügbar. " -"Prüfen Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." +"Der angeforderte Filamentplatz ist auf dieser Hardware nicht verfügbar. Prüfen " +"Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." #. MSG_RESET c=14 #: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 @@ -1886,11 +1866,11 @@ msgstr "Auswahl" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:3921 msgid "" -"Select a filament for the First Layer Calibration and select it in the on-" -"screen menu." +"Select a filament for the First Layer Calibration and select it in the on-screen " +"menu." msgstr "" -"Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es " -"im On-Screen-Menü aus." +"Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es im " +"On-Screen-Menü aus." #. MSG_SELECT_EXTRUDER c=20 #: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 @@ -1913,7 +1893,7 @@ msgstr "Wähle Sprache" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 #: ../../Firmware/ultralcd.cpp:4073 msgid "Select nozzle preheat temperature which matches your material." -msgstr "Bitte Vorheiztemperatur auswählen, die Ihrem Material entspricht." +msgstr "Vorheiztemperatur auswählen, die Ihrem Material entspricht." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 #: ../../Firmware/ultralcd.cpp:3926 @@ -2023,8 +2003,7 @@ msgstr "Leicht schräg" #. MSG_FILE_CNT c=20 r=6 #: ../../Firmware/cardreader.cpp:818 msgid "" -"Some files will not be sorted. Max. No. of files in 1 folder for sorting is " -"100." +"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "" "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." @@ -2066,8 +2045,7 @@ msgstr "Dreht sich" #. MSG_TEMP_CAL_WARNING c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4907 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "" -"Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." +msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." #. MSG_STATISTICS c=18 #: ../../Firmware/ultralcd.cpp:5572 @@ -2151,8 +2129,12 @@ msgstr "TMC UNTERSPANN.FEHL." #. 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 "Thermomodell Kal. benötigt ca. 12 Min. Siehe\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Thermomodell Kal. benötigt ca. 12 Min. Siehe\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2177,49 +2159,41 @@ msgstr "Teste filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "" -"The Idler cannot home properly. Check for anything blocking its movement." +msgid "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -"Die Spannrolle kann die Startposition nicht richtig erreichen. Prüfen Sie, " -"ob irgendetwas seine Bewegung blockiert." +"Die Spannrolle kann die Startposition nicht richtig erreichen. Prüfen Sie, ob " +"irgendetwas seine Bewegung blockiert." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"Die MMU meldet, dass dessen FW-Version nicht mit der FW des Druckers " -"kompatibel ist. Stellen Sie sicher, dass die MMU-Firmware auf dem neuesten " -"Stand ist." +"The MMU unit reports its FW version incompatible with the printer's firmware. " +"Make sure the MMU firmware is up to date." +msgstr "MMU meldet Inkompatibilität FW. Stell sicher, dass MMU-FW aktuell ist." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." -msgstr "" -"Der Selektor kann die Startposition nicht richtig erreichen. Prüfen Sie, ob " -"irgendetwas seine Bewegung blockiert." +msgstr "Selektor erreicht Startpos. nicht. Prüf, ob etwas blockiert." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 #: ../../Firmware/ultralcd.cpp:3929 msgid "" -"The printer will start printing a zig-zag line. Rotate the knob until you " -"reach the optimal height. Check the pictures in the handbook (Calibration " -"chapter)." +"The printer will start printing a zig-zag line. Rotate the knob until you reach " +"the optimal height. Check the pictures in the handbook (Calibration chapter)." msgstr "" -"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den " -"Knopf, bis Sie die optimale Höhe erreicht haben. Überprüfen Sie die Bilder " -"im Handbuch (Kapitel Kalibrierung)." +"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, " +"bis Sie die optimale Höhe erreicht haben. Überprüfen Sie die Bilder im Handbuch." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 #: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, " -"chapter First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, chapter " +"First steps, section Calibration flow." msgstr "" -"Die Z-Kalibrierung is noch notwendig. Bitte folgen Sie dem Handbuch, Kapitel " -"Erste Schritte, Abschnitt Kalibrierablauf." +"Die Z-Kalibrierung is noch notwendig. Folgen Sie dem Handbuch, Kapitel Erste " +"Schritte." #. MSG_SORT_TIME c=8 #: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 @@ -2266,11 +2240,11 @@ msgstr "ENTLADE MANUELL" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." +"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector is " +"free. Check FINDA connection." msgstr "" -"Unerwarteter FINDA-Wert. Stellen Sie sicher, dass sich kein Filament unter " -"FINDA befindet und der Selektor frei ist. Prüfen Sie die FINDA-Verbindung." +"Unerwarteter FINDA-Wert. Stellen Sie sicher, dass sich kein Filament unter FINDA " +"befindet und der Selektor frei ist. Prüfen Sie die FINDA-Verbindung." #. MSG_BTN_UNLOAD c=8 #: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 @@ -2285,8 +2259,7 @@ msgstr "Fil. entladen" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 msgid "Unloading filament" msgstr "Filament auswerfen" @@ -2306,8 +2279,7 @@ msgstr "Entlade zur Riemens." #: ../../Firmware/ultralcd.cpp:6247 msgid "Verification failed, remove the filament and try again." msgstr "" -"Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals " -"versuchen." +"Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals versuchen." #. MSG_MENU_VOLTAGES c=18 #: ../../Firmware/ultralcd.cpp:1725 @@ -2410,8 +2382,7 @@ msgstr "XYZ Kalibrierung in Ordnung. Schräglauf wird automatisch korrigiert." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 #: ../../Firmware/ultralcd.cpp:3342 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" -msgstr "" -"XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" +msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 #: ../../Firmware/ultralcd.cpp:3323 @@ -2420,8 +2391,7 @@ msgstr "XYZ-Kalibrierung beeinträchtigt. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 #: ../../Firmware/ultralcd.cpp:3326 -msgid "" -"XYZ calibration compromised. Right front calibration point not reachable." +msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Kal. -Punkt vorne rechts nicht erreichbar." @@ -2439,7 +2409,7 @@ msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kal.-Punkte nicht erreichbar." #: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 #: ../../Firmware/ultralcd.cpp:3336 msgid "XYZ calibration failed. Please consult the manual." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." +msgstr "XYZ-Kalibrierung fehlgeschlagen - mehr im Handbuch." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 #: ../../Firmware/ultralcd.cpp:3314 @@ -2473,8 +2443,7 @@ msgstr "Ja" #: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" -"Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu " -"starten." +"Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu starten." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4163 @@ -2529,11 +2498,9 @@ msgstr "⏬" msgid "🔃Refresh" msgstr "🔃Aktualisiere" -#~ msgid "" -#~ "Autoloading filament available only when filament sensor is turned on..." +#~ msgid "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" -#~ "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor " -#~ "verfügbar..." +#~ "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfügbar..." #~ msgid "Crash detected. Resume print?" #~ msgstr "Crash erkannt. Druck fortführen?" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index cc68b395b..f14a5ef49 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -4,16 +4,16 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:45 AM CET\n" -"PO-Revision-Date: Wed 16 Mar 2022 09:24:45 AM CET\n" +"PO-Revision-Date: 2023-02-23 12:47+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 @@ -450,8 +450,7 @@ msgid "" "calibration." msgstr "" "Distancia entre la punta del boquilla y la superficie de la base aun no " -"fijada. Por favor siga el manual, capitulo Primeros Pasos, Calibracion " -"primera capa." +"fijada. Siga el manual, capitulo Primeros Pasos." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 @@ -818,8 +817,8 @@ msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"Codigo G laminado para un nivel diferente. Por favor relamina el modelo de " -"nuevo. Impresion cancelada." +"Codigo G laminado para un nivel diferente. Relamina el modelo de nuevo. " +"Impresion cancelada." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 @@ -834,8 +833,8 @@ msgid "" "G-code sliced for a different printer type. Please re-slice the model again. " "Print cancelled." msgstr "" -"Codigo G laminado para una impresora diferente. Por favor relamina el modelo " -"de nuevo. Impresion cancelada." +"Codigo G laminado para una impresora diferente. Relamina el modelo de nuevo. " +"Impresion cancelada." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:370 @@ -848,8 +847,8 @@ msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" -"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. " -"Impresion cancelada." +"Codigo G laminado para nuevo firmware. Actualiza el firmware. Impresion " +"cancelada." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -996,7 +995,7 @@ msgid "" "Internal runtime error. Try resetting the MMU unit or updating the firmware. " "If the issue persists, contact support." msgstr "" -"Error interno de ejecucion. Intenta reiniciar la unidad MMU o actualizar el " +"Error interno de ejecucion. Intenta reiniciar la MMU o actualizar el " "firmware. Si el problema persiste, ponte en contacto con el servicio tecnico." #. MSG_FILAMENT_LOADED c=20 r=2 @@ -1120,7 +1119,7 @@ msgstr "ACT. FW MMU PRECISA" #. MSG_DESC_QUEUE_FULL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 msgid "MMU Firmware internal error, please reset the MMU." -msgstr "Error interno del firmware MMU, por favor reinicia el MMU." +msgstr "Error interno del firmware MMU, reinicia el MMU." #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 @@ -1161,8 +1160,8 @@ msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"La unidad MMU no responde correcta-mente. Comprueba el cableado y los " -"conectores. Si el problema persiste, contacta con el servicio técnico." +"La MMU no responde correcta-mente. Comprueba el cableado y los conectores. " +"Si el problema persiste, contacta con el servicio técnico." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 @@ -1170,8 +1169,8 @@ msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"La unidad MMU no responde. Comprueba el cableado y los conectores. Si el " -"problema persiste, ponte en contacto con el servicio tecnico." +"La MMU no responde. Comprueba el cableado y los conectores. Si el problema " +"persiste, ponte en contacto con el servicio tecnico." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1672 @@ -1522,8 +1521,7 @@ msgstr "" #. MSG_CHECK_IR_CONNECTION c=20 r=4 #: ../../Firmware/ultralcd.cpp:6240 msgid "Please check the IR sensor connection, unload filament if present." -msgstr "" -"Por favor comprueba la conexion del IR sensor y filamento esta descargado." +msgstr "Comprueba la conexion del IR sensor y filamento esta descargado." #. MSG_SELFTEST_PLEASECHECK c=20 #: ../../Firmware/ultralcd.cpp:6944 @@ -1533,7 +1531,7 @@ msgstr "Controla:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 #: ../../Firmware/ultralcd.cpp:4099 msgid "Please clean heatbed and then press the knob." -msgstr "Limpia la superficie de la base, por favor, y luego presiona el dial." +msgstr "Limpia la superficie de la base, y luego presiona el dial." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 @@ -1545,8 +1543,7 @@ msgstr "Limpia boquilla para calibracion. Clic cuando acabes." msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" -"Por favor, coloca el filamento en el extrusor, luego presiona el dial para " -"cargarlo." +"Coloca el filamento en el extrusor, luego presiona el dial para cargarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 #: ../../Firmware/ultralcd.cpp:3901 @@ -1554,51 +1551,51 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el " -"dial para cargarlo." +"Coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para " +"cargarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 #: ../../Firmware/ultralcd.cpp:3824 msgid "Please load filament first." -msgstr "Por favor, carga primero el filamento." +msgstr "Carga primero el filamento." #. MSG_CHECK_IDLER c=20 r=5 #: ../../Firmware/Marlin_main.cpp:3578 msgid "Please open idler and remove filament manually." -msgstr "Por favor abre el tensor y retira el filamento manualmente." +msgstr "Abre el tensor y retira el filamento manualmente." #. MSG_PLACE_STEEL_SHEET c=20 r=5 #: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:4041 msgid "Please place steel sheet on heatbed." -msgstr "Por favor coloca la lam. de acero en la base calefactable." +msgstr "Coloca la lam. de acero en la base calefactable." #. MSG_PRESS_TO_UNLOAD c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" -msgstr "Por favor, pulsa el dial para descargar el filamento" +msgstr "Pulsa el dial para descargar el filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 #: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 msgid "Please pull out filament immediately" -msgstr "Por favor retira el filamento de inmediato" +msgstr "Retira el filamento de inmediato" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 #: ../../Firmware/ultralcd.cpp:4036 msgid "Please remove shipping helpers first." -msgstr "Por favor retira los soportes de envio primero." +msgstr "Retira los soportes de envio primero." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." -msgstr "Por favor retira la lam. de acero de la base calefactable." +msgstr "Retira la lam. de acero de la base calefactable." #. MSG_RUN_XYZ c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4894 msgid "Please run XYZ calibration first." -msgstr "Por favor realiza la calibracion XYZ primero." +msgstr "Realiza la calibracion XYZ primero." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 #: ../../Firmware/ultralcd.cpp:6237 @@ -1712,8 +1709,8 @@ msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First " "steps, section Calibration flow." msgstr "" -"Impresora no esta calibrada todavia. Por favor usa el manual capitulo " -"Primeros pasos Calibracion flujo." +"Impresora no esta calibrada todavia. Usa el manual capitulo Primeros pasos " +"Calibracion flujo." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1723,8 +1720,8 @@ msgstr "Diametro nozzle impresora difiere de cod.G. Continuar?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en " "ajustes. Impresion cancelada." @@ -1780,8 +1777,8 @@ msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"La herramienta de filamento solicitada no esta disponible en este hardware. " -"Comprueba el codigo G para el indice de la herramienta fuera de rango (T0-" +"El filamento solicitado no está disponible en este hardware. Revise el " +"código G para verificar si el índice de herramienta está fuera de rango (T0-" "T4)." #. MSG_RESET c=14 @@ -2152,8 +2149,12 @@ msgstr "ERROR SBRVOLTAJE TMC" #. 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 "Cal. modelo térmico tarda 12 mins. aprox. Mira\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Cal. modelo térmico tarda 12 mins. aprox. Mira\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2190,8 +2191,8 @@ msgid "" "The MMU unit reports its FW version incompatible with the printer's " "firmware. Make sure the MMU firmware is up to date." msgstr "" -"La unidad MMU informa que su version de FW es incompatible con el firmware " -"de la impresora. Asegurate de que el firmware de la MMU esta actualizado." +"La MMU informa que su FW no es compatible con el de la impresora. Asegurate " +"de que el FW esta actualizado." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 @@ -2218,8 +2219,8 @@ msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" -"Todavia es necesario hacer una calibracion Z. Por favor siga el manual, " -"capitulo Primeros pasos, seccion Calibracion del flujo." +"Todavia es necesario hacer una calibracion Z. Siga el manual, capitulo " +"Primeros pasos." #. MSG_SORT_TIME c=8 #: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 @@ -2439,7 +2440,7 @@ msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." #: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 #: ../../Firmware/ultralcd.cpp:3336 msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibracion XYZ fallada. Consulta el manual por favor." +msgstr "Calibracion XYZ fallada. Consulta el manual." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 #: ../../Firmware/ultralcd.cpp:3314 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 7ae779591..8d16d1d02 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -4,26 +4,26 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:48 AM CET\n" -"PO-Revision-Date: Wed 16 Mar 2022 09:24:48 AM CET\n" +"PO-Revision-Date: 2023-02-23 12:55+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 +#: ../../Firmware/messages.cpp:165 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 +#: ../../Firmware/messages.cpp:164 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" @@ -224,8 +224,8 @@ msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans " -"l'axe Z jusqu'aux butees. Cliquez une fois fait." +"Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe " +"Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 @@ -236,11 +236,11 @@ msgstr "Calibration Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 #: ../../Firmware/ultralcd.cpp:2936 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end " -"stoppers. Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " +"Click when done." msgstr "" -"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe " -"Z jusqu'aux butees. Cliquez une fois fait." +"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z " +"jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATING_HOME c=20 #: ../../Firmware/ultralcd.cpp:7295 @@ -449,11 +449,10 @@ msgstr "Desenga.t de l'idler" #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " -"calibration." +"Please follow the manual, chapter First steps, section First layer calibration." msgstr "" "La distance entre de la buse et du plateau n'a pas encore ete reglee. Suivez " -"le manuel, chap. Premiers pas - Calibration de la premiere couche." +"le manuel, chap. Premiers pas." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 @@ -584,18 +583,17 @@ msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA non desactivee lors du dechargement du filament. Essayez de decharger " -"a la main. Assurez-vous que le filament peut bouger et que la FINDA " -"fonctionne." +"FINDA non desactivee lors du dechargement du filament. Essayez de decharger a " +"la main. Assurez-vous que le filament peut bouger et que la FINDA fonctionne." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can " -"move and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can move " +"and FINDA works." msgstr "" -"La FINDA ne s'est pas declenchee lors du chargement du filament. Assurez-" -"vous que le filament peut bouger et que la FINDA fonctionne." +"La FINDA ne s'est pas declenchee lors du chargement du filament. Assurez-vous " +"que le filament peut bouger et que la FINDA fonctionne." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 #: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 @@ -730,14 +728,14 @@ msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Capteur de f. non desactive lors du dechargement du filament. Assurez-vous " -"que le filament peut bouger et que le capteur fonctionne." +"Capteur de f. non desactive lors du dechargement du filament. Assurez-vous que " +"le filament peut bouger et que le capteur fonctionne." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the filament " +"reached the fsensor and the sensor works." msgstr "" "Capteur de f. non declenche lors du chargement du filament. Assurez-vous que " "le filament a atteint le capteur f et que le capteur fonctionne." @@ -748,8 +746,8 @@ msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Capteur de f. declenche trop tot lors du chargement dans l'extrudeur. " -"Verifiez le tube PTFE. Verifiez que le capteur fonctionne." +"Capteur de f. declenche trop tot lors du chargement dans l'extrudeur. Verifiez " +"le tube PTFE. Verifiez que le capteur fonctionne." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -777,8 +775,8 @@ msgstr "Cal. 1ere couche" #: ../../Firmware/ultralcd.cpp:4021 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" -"Je vais lancer le Auto-test pour verifier les problemes d'assemblage les " -"plus communs." +"Je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus " +"communs." #. MSG_FLOW c=15 #: ../../Firmware/ultralcd.cpp:5711 @@ -828,8 +826,7 @@ msgstr "" #: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 #: ../../Firmware/util.cpp:454 msgid "G-code sliced for a different printer type. Continue?" -msgstr "" -"G-code a ete prepare pour un type d'im- primante dif. Cont.?" +msgstr "G-code a ete prepare pour un type d'im- primante dif. Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 @@ -852,8 +849,8 @@ msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" -"G-code a ete prepare pour un nouveau firmware. Mettre a jour le firmware. " -"Impression annulee." +"G-code a ete prepare pour un nouveau FW. Mettre a jour le FW. Impression " +"annulee." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -887,8 +884,8 @@ msgstr "Chauffe terminee." #: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " -"setup process, in which the Z-axis will be calibrated. Then, you will be " -"ready to print." +"setup process, in which the Z-axis will be calibrated. Then, you will be ready " +"to print." msgstr "" "Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous guider au " "cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. " @@ -961,8 +958,8 @@ msgstr "OUTIL INVALIDE" #. MSG_ADDITIONAL_SHEETS c=20 r=9 #: ../../Firmware/ultralcd.cpp:4104 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - " -"HW Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - HW " +"Setup - Steel sheets." msgstr "" "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans " "Reglages - Config HW - Plaque en acier." @@ -990,8 +987,7 @@ msgstr "Inserez le filament" #. MSG_INSERT_FIL c=20 r=6 #: ../../Firmware/ultralcd.cpp:6215 msgid "" -"Insert the filament (do not load it) into the extruder and then press the " -"knob." +"Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis " "appuyez sur le bouton." @@ -1003,7 +999,7 @@ msgid "" "If the issue persists, contact support." msgstr "" "Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour " -"le firmware. Si le probleme persiste, contactez le support." +"le FW. Si le probleme persiste, contactez le support." #. MSG_FILAMENT_LOADED c=20 r=2 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 @@ -1102,8 +1098,8 @@ msgstr "Charg. de la couleur" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3908 msgid "Loading filament" msgstr "Chargement du fil." @@ -1126,7 +1122,7 @@ msgstr "MAJ FW MMU NECESS." #. MSG_DESC_QUEUE_FULL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 msgid "MMU Firmware internal error, please reset the MMU." -msgstr "Erreur interne du firmware du MMU, reinitialiser le MMU." +msgstr "Erreur interne du FW du MMU, reinitialiser le MMU." #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 @@ -1167,8 +1163,8 @@ msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"L'unite MMU ne repond pas correctement. Verifiez le cablage et les " -"connecteurs. Si le probleme persiste, contactez le support." +"MMU ne repond pas correctement. Verifiez le cablage et les connecteurs. Si le " +"probleme persiste, contactez le support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 @@ -1176,8 +1172,8 @@ msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"L'unite MMU ne repond pas. Verifiez le cablage et les connecteurs. Si le " -"probleme persiste, contactez le support." +"MMU ne repond pas. Verifiez le cablage et les connecteurs. Si le probleme " +"persiste, contactez le support." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1672 @@ -1304,7 +1300,7 @@ msgstr "I/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 #: ../../Firmware/util.cpp:199 msgid "New firmware version available:" -msgstr "Nouvelle version de firmware disponible:" +msgstr "Nouvelle version de FW disponible:" #. MSG_NO c=4 #: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 @@ -1471,11 +1467,11 @@ msgstr "Echec de la calibration en PINDA" #: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 #: ../../Firmware/ultralcd.cpp:3367 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu " -"Settings->PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu Settings-" +">PINDA cal." msgstr "" -"La calibration en PINDA est terminee et activee. Il peut etre desactivee " -"dans le menu Reglages-> Calib. PINDA" +"La calibration en PINDA est terminee et activee. Il peut etre desactivee dans " +"le menu Reglages-> Calib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 #: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 @@ -1545,17 +1541,16 @@ msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 #: ../../Firmware/ultralcd.cpp:3904 -msgid "" -"Please insert filament into the extruder, then press the knob to load it." +msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "" -"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton " -"pour le charger." +"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour " +"le charger." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 #: ../../Firmware/ultralcd.cpp:3901 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob " -"to load it." +"Please insert filament into the first tube of the MMU, then press the knob to " +"load it." msgstr "" "Inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton " "pour le charger." @@ -1715,8 +1710,8 @@ msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First " "steps, section Calibration flow." msgstr "" -"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre " -"Premiers pas - Processus de calibration." +"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers " +"pas - Processus de calibration." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1726,18 +1721,17 @@ msgstr "Diamètre de la buse diffère du G-Code. Continuer?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" -"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. " -"Impression annulee." +"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression annulee." #. MSG_DESC_PULLEY_STALLED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" -"Le moteur de la poulie s'est bloque. Assurez-vous que la poulie peut bouger " -"et verifiez le cablage." +"Le moteur de la poulie s'est bloque. Assurez-vous que la poulie peut bouger et " +"verifiez le cablage." #. MSG_PROGRESS_PUSH_FILAMENT c=20 #: ../../Firmware/mmu2_progress_converter.cpp:23 @@ -1911,8 +1905,8 @@ msgstr "Choisir langue" #: ../../Firmware/ultralcd.cpp:4073 msgid "Select nozzle preheat temperature which matches your material." msgstr "" -"Selectionnez la temperature de prechauffage de la buse qui correspond a " -"votre materiau." +"Selectionnez la temperature de prechauffage de la buse qui correspond a votre " +"materiau." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 #: ../../Firmware/ultralcd.cpp:3926 @@ -2151,8 +2145,12 @@ msgstr "ERR SOUS TENSION TMC" #. 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 "Cal. du modele thermique dure env. 12 min. Vois\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Cal. du modele thermique dure env. 12 min. Vois\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2177,28 +2175,27 @@ msgstr "Test du filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "" -"The Idler cannot home properly. Check for anything blocking its movement." +msgid "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -"L'Idler ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi " -"que ce soit qui bloque son mouvement." +"L'Idler ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi que " +"ce soit qui bloque son mouvement." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." +"The MMU unit reports its FW version incompatible with the printer's firmware. " +"Make sure the MMU firmware is up to date." msgstr "" -"L'unite MMU signale que sa version de FW est incompatible avec le FW de " -"l'imprimante. Assurez-vous que le firmware du MMU est à jour." +"MMU signale que sa version de FW est incompatible avec le FW de l'imprimante. " +"Assurez-vous que le FW du MMU est à jour." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" -"Le selecteur ne peut pas se mettre correctement a zero. Verifiez s'il y a " -"quoi que ce soit qui bloque son mouvement." +"Le selecteur ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi " +"que ce soit qui bloque son mouvement." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 #: ../../Firmware/ultralcd.cpp:3929 @@ -2213,8 +2210,8 @@ msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 #: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, " -"chapter First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, chapter " +"First steps, section Calibration flow." msgstr "" "Il faut toujours effectuer la Calibration Z. Suivre le manuel, chapitre " "Premiers pas - Processus de calibration." @@ -2283,8 +2280,7 @@ msgstr "Decharger fil." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 msgid "Unloading filament" msgstr "Dechargement fil." @@ -2419,8 +2415,7 @@ msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 #: ../../Firmware/ultralcd.cpp:3326 -msgid "" -"XYZ calibration compromised. Right front calibration point not reachable." +msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Calibration XYZ compromise. Le point de calibration avant droit n'est pas " "atteignable." @@ -2476,8 +2471,7 @@ msgstr "Oui" #. MSG_WIZARD_QUIT c=20 r=8 #: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "" -"Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." +msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4163 @@ -2535,8 +2529,7 @@ msgstr "🔃Rafraichir" #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" -#~ "Chargement auto du filament uniquement si le capteur de filament est " -#~ "active." +#~ "Chargement auto du filament uniquement si le capteur de filament est active." #~ msgid "Crash detected. Resume print?" #~ msgstr "Crash detecte. Poursuivre l'impression?" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 60f9a7cdd..6065f2584 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -4,16 +4,16 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:52 AM CET\n" -"PO-Revision-Date: 2022-10-13 22:49+0200\n" +"PO-Revision-Date: 2023-02-23 13:05+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 @@ -450,8 +450,7 @@ msgid "" "calibration." msgstr "" "Distanza tra la punta dell'ugello e la superficie del piano non ancora " -"impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione " -"Calibrazione primo strato." +"impostata. Seguire manuale, Primi Passi, Calibrazione primo strato." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 @@ -835,13 +834,13 @@ msgid "" "G-code sliced for a different printer type. Please re-slice the model again. " "Print cancelled." msgstr "" -"G-code processato per una stampante diversa. Per favore esegui nuovamente lo " -"slice del modello. Stampa annullata." +"G-code processato per un'altra stampante. Per favore rislice il modello. " +"Annullamento stampa." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:370 msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code processato per un firmware piu recente. Continuare?" +msgstr "G-code processato per un FW piu recente. Continuare?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/util.cpp:377 @@ -849,8 +848,8 @@ msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" -"G-code processato per un firmware piu recente. Per favore aggiorna il " -"firmware. Stampa annullata." +"G-code processato per un FW piu recente. Per favore aggiorna il FW. Stampa " +"annullata." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -998,7 +997,7 @@ msgid "" "If the issue persists, contact support." msgstr "" "Errore runtime interno. Provare a resettare l'unità MMU o ad aggiornare il " -"firmware. Se il problema persiste, contattare l'assistenza." +"FW. Se il problema persiste, contattare l'assistenza." #. MSG_FILAMENT_LOADED c=20 r=2 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 @@ -1121,7 +1120,7 @@ msgstr "AGG FW MMU NECESSARI" #. MSG_DESC_QUEUE_FULL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 msgid "MMU Firmware internal error, please reset the MMU." -msgstr "Errore interno firmware MMU, resettare la MMU." +msgstr "Errore interno FW MMU, resettare la MMU." #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 @@ -1299,7 +1298,7 @@ msgstr "N/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 #: ../../Firmware/util.cpp:199 msgid "New firmware version available:" -msgstr "Nuova vers. firmware disponibile:" +msgstr "Nuova vers. FW disponibile:" #. MSG_NO c=4 #: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 @@ -1514,8 +1513,8 @@ msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" -"Per favore consulta il nostro manuale per risolvere il problema. Poi " -"riprendi il Wizard dopo aver riavviato la stampante." +"Consulta il manuale per risolvere il problema, poi riavvia la stampante e " +"riprendi il Wizard." #. MSG_CHECK_IR_CONNECTION c=20 r=4 #: ../../Firmware/ultralcd.cpp:6240 @@ -1530,7 +1529,7 @@ msgstr "Verifica:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 #: ../../Firmware/ultralcd.cpp:4099 msgid "Please clean heatbed and then press the knob." -msgstr "Per favore pulisci il piatto, poi premi la manopola." +msgstr "Pulisci il piatto, poi premi la manopola." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 @@ -1550,13 +1549,13 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la " -"manopola per caricarlo." +"Inserisci il filamento nel primo tubo del MMU, poi premi la manopola per " +"caricarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 #: ../../Firmware/ultralcd.cpp:3824 msgid "Please load filament first." -msgstr "Per favore prima carica il filamento." +msgstr "Carica il filamento, per favore." #. MSG_CHECK_IDLER c=20 r=5 #: ../../Firmware/Marlin_main.cpp:3578 @@ -1567,7 +1566,7 @@ msgstr "Aprire la guida filam. e rimuovere il filam. a mano" #: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:4041 msgid "Please place steel sheet on heatbed." -msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." +msgstr "Posizionate la piastra d'acciaio sul piano riscaldato." #. MSG_PRESS_TO_UNLOAD c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 @@ -1583,7 +1582,7 @@ msgstr "Estrarre il filamento immediatamente" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 #: ../../Firmware/ultralcd.cpp:4036 msgid "Please remove shipping helpers first." -msgstr "Per favore rimuovete i materiali da spedizione" +msgstr "Rimuovete i materiali da spedizione" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 @@ -1709,7 +1708,7 @@ msgid "" "steps, section Calibration flow." msgstr "" "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo " -"Primi Passi, sezione Sequenza di Calibrazione." +"Primi Passi." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1719,8 +1718,8 @@ msgstr "Diametro ugello diverso da G-Code. Continuare?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. " "Stampa annullata." @@ -2145,8 +2144,12 @@ 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 "Calib mod termico richiede circa 12 min. Vedere\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Calib mod termico richiede circa 12 min. Vedere\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2183,8 +2186,8 @@ msgid "" "The MMU unit reports its FW version incompatible with the printer's " "firmware. Make sure the MMU firmware is up to date." msgstr "" -"L'unità MMU segnala la sua versione FW incompatibile con il firmware della " -"stampante. Verifica che il firmware della MMU sia aggiornato." +"L'unità MMU segnala la sua versione FW incompatibile con il FW della " +"stampante. Verifica che il FW della MMU sia aggiornato." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 @@ -2211,8 +2214,8 @@ msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" -"E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo " -"Primi Passi, sezione Sequenza di Calibrazione." +"E ancora necessario effettuare la calibrazione Z. Seguire manuale, cap. " +"Primi Passi - Sequenza di Calibrazione." #. MSG_SORT_TIME c=8 #: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 @@ -2432,7 +2435,7 @@ msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." #: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 #: ../../Firmware/ultralcd.cpp:3336 msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." +msgstr "Calibraz. XYZ fallita. Consultare manuale." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 #: ../../Firmware/ultralcd.cpp:3314 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 4e55d25e7..74cd16212 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -4,26 +4,26 @@ msgid "" msgstr "" "Project-Id-Version: Prusa-Firmware\n" "POT-Creation-Date: Wed 16 Mar 2022 09:24:56 AM CET\n" -"PO-Revision-Date: Wed 16 Mar 2022 09:24:56 AM CET\n" +"PO-Revision-Date: 2023-02-23 13:17+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 3.2.2\n" +"X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 +#: ../../Firmware/messages.cpp:165 msgid " 0.3 or older" msgstr " 0.3 lub starszy" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 +#: ../../Firmware/messages.cpp:164 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" @@ -235,8 +235,8 @@ msgstr "Kalibruje Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 #: ../../Firmware/ultralcd.cpp:2936 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end " -"stoppers. Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " +"Click when done." msgstr "" "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych " "ogranicznikow. Nacisnij, by potwierdzic." @@ -447,11 +447,10 @@ msgstr "Zwalnianie docisku" #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " -"calibration." +"Please follow the manual, chapter First steps, section First layer calibration." msgstr "" -"Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie " -"z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." +"Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z " +"instrukcja: rozdzial Wprowadzenie." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 #: ../../Firmware/ultralcd.cpp:4096 @@ -582,18 +581,17 @@ msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA nie wylaczyla sie podczas rozlad-owywania filamentu. Sprobuj " -"rozladowac recznie. Sprawdz, czy filament moze sie poruszac i czy FINDA " -"dziala." +"FINDA nie wylaczyla sie podczas rozlad-owywania filamentu. Sprobuj rozladowac " +"recznie. Sprawdz, czy filament moze sie poruszac i czy FINDA dziala." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can " -"move and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can move " +"and FINDA works." msgstr "" -"FINDA nie uruchamia sie podczas ladowania filamentu. Upewnij sie, ze " -"filament moze sie poruszac i FINDA dziala." +"FINDA nie uruchamia sie podczas ladowania filamentu. Upewnij sie, ze filament " +"moze sie poruszac i FINDA dziala." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 #: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 @@ -728,14 +726,14 @@ msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Czujnik filamentu nie wylaczyl sie podczas rozladowywania filamentu. " -"Sprawdz, czy filament moze sie poruszac i czy czujnik dziala." +"Czujnik filamentu nie wylaczyl sie podczas rozladowywania filamentu. Sprawdz, " +"czy filament moze sie poruszac i czy czujnik dziala." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the filament " +"reached the fsensor and the sensor works." msgstr "" "Czujnik filamentu nie zadzialal podczas ladowania filamentu. Sprawdz, czy " "filament dotarl do czujnika i czy czujnik dziala." @@ -746,8 +744,8 @@ msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Cz. filam. zadzialal zbyt wczesnie podcz. ladowania do ekstr. Sprawdz czy " -"nic nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." +"Cz. filam. zadzialal zbyt wczesnie podcz. ladowania do ekstr. Sprawdz czy nic " +"nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -818,8 +816,7 @@ msgstr "G-code pociety dla innej wersji. Kontynuowac?" msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." -msgstr "" -"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." +msgstr "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 @@ -834,21 +831,19 @@ msgid "" "G-code sliced for a different printer type. Please re-slice the model again. " "Print cancelled." msgstr "" -"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk " -"anulowany." +"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:370 msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code pociety dla nowszego firmware. Kontynuowac?" +msgstr "G-code pociety dla nowszego FW. Kontynuowac?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 #: ../../Firmware/util.cpp:377 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." -msgstr "" -"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." +msgstr "G-code pociety dla nowszego FW. Zaktualizuj FW. Druk anulowany." #. MSG_HW_SETUP c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 @@ -882,11 +877,11 @@ msgstr "Grzanie zakonczone" #: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " -"setup process, in which the Z-axis will be calibrated. Then, you will be " -"ready to print." +"setup process, in which the Z-axis will be calibrated. Then, you will be ready " +"to print." msgstr "" -"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez " -"krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." +"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka " +"kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." #. MSG_WIZARD_WELCOME c=20 r=7 #: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 @@ -954,8 +949,8 @@ msgstr "BLEDNE NARZEDZIE" #. MSG_ADDITIONAL_SHEETS c=20 r=9 #: ../../Firmware/ultralcd.cpp:4104 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - " -"HW Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - HW " +"Setup - Steel sheets." msgstr "" "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu " "Ustawienia - Ustawienia HW - Plyty stalowe." @@ -983,11 +978,9 @@ msgstr "Wprowadz filament" #. MSG_INSERT_FIL c=20 r=6 #: ../../Firmware/ultralcd.cpp:6215 msgid "" -"Insert the filament (do not load it) into the extruder and then press the " -"knob." +"Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" -"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij " -"pokretlo." +"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 @@ -995,8 +988,8 @@ msgid "" "Internal runtime error. Try resetting the MMU unit or updating the firmware. " "If the issue persists, contact support." msgstr "" -"Wewnetrzny blad dzialania. Sprobuj zresetowac MMU lub zaktualizowac FW. " -"Jesli problem nadal wystepuje, skontaktuj sie z pomoca techniczna." +"Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW. Skontaktuj sie z " +"pomoca techniczna, jeśli problem nadal występuje." #. MSG_FILAMENT_LOADED c=20 r=2 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 @@ -1095,8 +1088,8 @@ msgstr "Czyszcz. koloru" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3908 msgid "Loading filament" msgstr "Laduje filament" @@ -1119,7 +1112,7 @@ msgstr "MMU FW WYMAGA AKTUAL" #. MSG_DESC_QUEUE_FULL c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 msgid "MMU Firmware internal error, please reset the MMU." -msgstr "Blad wewnetrzny MMU Firmware, zresetuj MMU." +msgstr "Blad wewnetrzny MMU FW, zresetuj MMU." #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 @@ -1160,8 +1153,8 @@ msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"Jednostka MMU nie reaguje prawidlowo. Sprawdz okablowanie i zlacza. Jesli " -"problem nadal wystepuje, skontaktuj sie z pomoca techniczna." +"MMU nie dziala. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje, " +"skontaktuj sie z pomoca techniczna." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 @@ -1169,8 +1162,8 @@ msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"Jednostka MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal " -"wystepuje, skontaktuj sie z pomoca techniczna." +"MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje, " +"skontaktuj sie z pomoca techniczna." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1672 @@ -1297,7 +1290,7 @@ msgstr "N/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 #: ../../Firmware/util.cpp:199 msgid "New firmware version available:" -msgstr "Dostepna nowa wersja firmware:" +msgstr "Dostepna nowa wersja FW:" #. MSG_NO c=4 #: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 @@ -1463,11 +1456,11 @@ msgstr "Kalibracja temperaturowa nieudana" #: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 #: ../../Firmware/ultralcd.cpp:3367 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu " -"Settings->PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu Settings-" +">PINDA cal." msgstr "" -"Kalibracja PINDA zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia " -"-> Kalib. PINDA" +"Kalibracja PINDA zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -" +"> Kalib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 #: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 @@ -1537,15 +1530,14 @@ msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 #: ../../Firmware/ultralcd.cpp:3904 -msgid "" -"Please insert filament into the extruder, then press the knob to load it." +msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 #: ../../Firmware/ultralcd.cpp:3901 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob " -"to load it." +"Please insert filament into the first tube of the MMU, then press the knob to " +"load it." msgstr "" "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go " "zaladowac." @@ -1558,14 +1550,13 @@ msgstr "Najpierw zaladuj filament." #. MSG_CHECK_IDLER c=20 r=5 #: ../../Firmware/Marlin_main.cpp:3578 msgid "Please open idler and remove filament manually." -msgstr "" -"Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." +msgstr "Odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 #: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:4041 msgid "Please place steel sheet on heatbed." -msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." +msgstr "Umiescic plyte stalowa na stole podgrzewanym." #. MSG_PRESS_TO_UNLOAD c=20 r=4 #: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 @@ -1587,12 +1578,12 @@ msgstr "Najpierw usun zabezpieczenia transportowe" #: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." -msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." +msgstr "Zdjac plyte stalowa z podgrzewanego stolu." #. MSG_RUN_XYZ c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4894 msgid "Please run XYZ calibration first." -msgstr "Prosze najpierw uruchomic kalibracje XYZ" +msgstr "Najpierw uruchomic kalibracje XYZ" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 #: ../../Firmware/ultralcd.cpp:6237 @@ -1707,7 +1698,7 @@ msgid "" "steps, section Calibration flow." msgstr "" "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial " -"Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +"Pierwsze Kroki." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 #: ../../Firmware/util.cpp:289 @@ -1717,8 +1708,8 @@ msgstr "Srednica dyszy rozni sie od tej w G-code. Kontynuowac?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 #: ../../Firmware/util.cpp:295 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings. " +"Print cancelled." msgstr "" "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." @@ -1875,8 +1866,7 @@ msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" -"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu " -"ekranowym." +"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." #. MSG_SELECT_EXTRUDER c=20 #: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 @@ -2014,8 +2004,7 @@ msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." msgstr "" -"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = " -"100." +"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3049 @@ -2055,8 +2044,7 @@ msgstr "Kreci sie" #. MSG_TEMP_CAL_WARNING c=20 r=4 #: ../../Firmware/Marlin_main.cpp:4907 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "" -"Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." +msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." #. MSG_STATISTICS c=18 #: ../../Firmware/ultralcd.cpp:5572 @@ -2140,8 +2128,12 @@ msgstr "ZA NIS. NAPIECIE TMC" #. 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 "Kal. modelu termicznego trwa ok. 12min. Spójrz\nprusa.io/tm-cal" +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Kal. modelu termicznego trwa ok. 12min. Spójrz\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 @@ -2166,8 +2158,7 @@ msgstr "Test filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "" -"The Idler cannot home properly. Check for anything blocking its movement." +msgid "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Docisk nie moze sie prawidlowo zbazowac. Sprawdz, czy nic nie blokuje jego " "ruchu." @@ -2175,11 +2166,11 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." +"The MMU unit reports its FW version incompatible with the printer's firmware. " +"Make sure the MMU firmware is up to date." msgstr "" -"Jednostka MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW " -"MMU jest aktualne." +"MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW MMU jest " +"aktualne." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 @@ -2203,11 +2194,11 @@ msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 #: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, " -"chapter First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, chapter " +"First steps, section Calibration flow." msgstr "" "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze " -"Kroki, sekcja Kalibracja." +"Kroki." #. MSG_SORT_TIME c=8 #: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 @@ -2273,8 +2264,7 @@ msgstr "Rozladowanie fil" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 msgid "Unloading filament" msgstr "Rozladowuje filament" @@ -2405,8 +2395,7 @@ msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 #: ../../Firmware/ultralcd.cpp:3326 -msgid "" -"XYZ calibration compromised. Right front calibration point not reachable." +msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 @@ -2431,8 +2420,8 @@ msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." #: ../../Firmware/ultralcd.cpp:3314 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" -"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic " -"montaz drukarki." +"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz " +"drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 #: ../../Firmware/ultralcd.cpp:3339 @@ -2459,8 +2448,7 @@ msgstr "Tak" #. MSG_WIZARD_QUIT c=20 r=8 #: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "" -"Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4163 From 93598ef00de32baed6814b65fe50d11819090d25 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 12:36:27 +0100 Subject: [PATCH 024/240] Change some messages to be max three rows instead of two Yes|No are now located at the 4th row and so messages can use three rows. This should allow improvement in some translations. --- Firmware/Marlin_main.cpp | 2 +- Firmware/messages.cpp | 8 ++++---- Firmware/ultralcd.cpp | 2 +- lang/po/Firmware.pot | 12 ++++++------ lang/po/Firmware_cs.po | 12 ++++++------ lang/po/Firmware_de.po | 12 ++++++------ lang/po/Firmware_es.po | 12 ++++++------ lang/po/Firmware_fr.po | 12 ++++++------ lang/po/Firmware_hr.po | 12 ++++++------ lang/po/Firmware_hu.po | 12 ++++++------ lang/po/Firmware_it.po | 12 ++++++------ lang/po/Firmware_nl.po | 12 ++++++------ lang/po/Firmware_no.po | 12 ++++++------ lang/po/Firmware_pl.po | 12 ++++++------ lang/po/Firmware_ro.po | 12 ++++++------ lang/po/Firmware_sk.po | 12 ++++++------ lang/po/Firmware_sv.po | 12 ++++++------ 17 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9413e7017..9a3aa66d3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3526,7 +3526,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float { KEEPALIVE_STATE(PAUSED_FOR_USER); uint8_t choice = - lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, LCD_LEFT_BUTTON_CHOICE); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2 + lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, LCD_LEFT_BUTTON_CHOICE); ////MSG_UNLOAD_SUCCESSFUL c=20 r=3 if (choice == LCD_MIDDLE_BUTTON_CHOICE) { lcd_clear(); lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 8bbfd1fb7..326bcc5b2 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -34,8 +34,8 @@ const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////MSG_FILAMENT c=17 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14 const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15 const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15 -const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////MSG_FILAMENT_CLEAN c=20 r=2 -const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////MSG_FILAMENT_LOADED c=20 r=2 +const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////MSG_FILAMENT_CLEAN c=20 r=3 +const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////MSG_FILAMENT_LOADED c=20 r=3 const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////MSG_FILAMENTCHANGE c=18 const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////MSG_FINISHING_MOVEMENTS c=20 @@ -79,7 +79,7 @@ const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////MS const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////MSG_PRESS_TO_UNLOAD c=20 r=4 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////MSG_PRINT_ABORTED c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////MSG_PULL_OUT_FILAMENT c=20 r=4 -const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////MSG_RECOVER_PRINT c=20 r=2 +const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////MSG_RECOVER_PRINT c=20 r=3 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\x04Refresh"); ////MSG_REFRESH c=18 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////MSG_REMOVE_STEEL_SHEET c=20 r=4 const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////MSG_RESET c=14 @@ -109,7 +109,7 @@ const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////MSG_AUTO_POWER const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////MSG_SILENT c=7 const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////MSG_NORMAL c=7 const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////MSG_STEALTH c=7 -const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////MSG_STEEL_SHEET_CHECK c=20 r=2 +const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////MSG_STEEL_SHEET_CHECK c=20 r=3 const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////MSG_STOP_PRINT c=18 const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED."); ////MSG_STOPPED c=20 const char MSG_PINDA_CALIBRATION[] PROGMEM_I1 = ISTR("PINDA cal."); ////MSG_PINDA_CALIBRATION c=13 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dbd4715ae..42a562317 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2875,7 +2875,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) } } // Let the user confirm, that the Z carriage is at the top end stoppers. - uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 + uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 if (result == LCD_BUTTON_TIMEOUT) goto canceled; else if (result == LCD_LEFT_BUTTON_CHOICE) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index b15bd4b9e..f7bcb2fa0 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -61,7 +61,7 @@ msgstr "" msgid "Ambient" msgstr "" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "Belt test" msgstr "" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -676,7 +676,7 @@ msgstr "" msgid "Filament" msgstr "" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -947,13 +947,13 @@ msgid "" " If the issue persists, contact support." msgstr "" -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2253,7 +2253,7 @@ msgstr "" msgid "Warning: printer type changed." msgstr "" -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index ddd577fcd..32a36ec88 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -70,7 +70,7 @@ msgstr "Vzdy" msgid "Ambient" msgstr "Okoli" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" @@ -185,7 +185,7 @@ msgstr "Stav remenu" msgid "Belt test" msgstr "Test remenu" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -700,7 +700,7 @@ msgstr "Fil. senzor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -991,13 +991,13 @@ msgstr "" "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW. Pokud pretrvava, " "kontakujte tech. podporu." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Je filament zaveden?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2342,7 +2342,7 @@ msgstr "Varovani: doslo ke zmene typu motherboardu." msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index f5ba6c8d6..0cee3806a 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -70,7 +70,7 @@ msgstr "Immer" msgid "Ambient" msgstr "Raumtemp." -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" @@ -182,7 +182,7 @@ msgstr "Gurtstatus" msgid "Belt test" msgstr "Riementest" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -697,7 +697,7 @@ msgstr "Fil. Sensor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -993,13 +993,13 @@ msgstr "" "Interner Laufzeitfehler. MMU-Einheit zurücksetzen oder Firmware aktualisieren. " "Ansonsten Support kontaktieren." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2342,7 +2342,7 @@ msgstr "Warnung: Platinentyp wurde geändert." msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geändert." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index f14a5ef49..07d8f771c 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -70,7 +70,7 @@ msgstr "Siemp." msgid "Ambient" msgstr "Ambiente" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" @@ -185,7 +185,7 @@ msgstr "Estado de correa" msgid "Belt test" msgstr "Test cinturon" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -701,7 +701,7 @@ msgstr "Sensor Fil." msgid "Filament" msgstr "Filamento" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -998,13 +998,13 @@ msgstr "" "Error interno de ejecucion. Intenta reiniciar la MMU o actualizar el " "firmware. Si el problema persiste, ponte en contacto con el servicio tecnico." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2370,7 +2370,7 @@ msgstr "Aviso: el tipo de placa ha cambiado." msgid "Warning: printer type changed." msgstr "Aviso: ha cambiado el tipo de impresora." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Se descargo con exito el filamento?" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 8d16d1d02..05bce27eb 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -70,7 +70,7 @@ msgstr "Tjrs" msgid "Ambient" msgstr "Ambiant" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" @@ -186,7 +186,7 @@ msgstr "Statut courroie" msgid "Belt test" msgstr "Test de courroie" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -704,7 +704,7 @@ msgstr "Capteur Fil." msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -1001,13 +1001,13 @@ msgstr "" "Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour " "le FW. Si le probleme persiste, contactez le support." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2362,7 +2362,7 @@ msgstr "Attention: Type de carte mere modifie." msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 70008b700..4b5897e1d 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -70,7 +70,7 @@ msgstr "Uvijek" msgid "Ambient" msgstr "Ambijent" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Jesu lijevi i desni Z~nosaci podignuti?" @@ -185,7 +185,7 @@ msgstr "Status remena" msgid "Belt test" msgstr "Testiranje remena" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -700,7 +700,7 @@ msgstr "Fil. senzor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -996,13 +996,13 @@ msgstr "" "Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU jedinicu ili " "azurirati firmware. Ako se problem nastavi, obratite se podrsci." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Je li filament napunjen?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2354,7 +2354,7 @@ msgstr "Upozorenje: tip maticne ploce je promijenjen." msgid "Warning: printer type changed." msgstr "Upozorenje: promijenjena je vrsta printera." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Je li praznjenje fil. bilo uspjesno?" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 373438841..2e68da507 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -70,7 +70,7 @@ msgstr "Mindig" msgid "Ambient" msgstr "Kornyezet" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "A Z tengely a felso vegponton van?" @@ -185,7 +185,7 @@ msgstr "Szij allapot" msgid "Belt test" msgstr "Szij teszt" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -703,7 +703,7 @@ msgstr "Fil. szenzor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -1000,13 +1000,13 @@ msgstr "" "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret. Ha a " "problema fennall, fordulj a supporthoz." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Filament behelyezve?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2358,7 +2358,7 @@ msgstr "Figyelem: az alaplap tipusa megvaltozott." msgid "Warning: printer type changed." msgstr "Figyelem: a nyomtato tipusa megvaltozott." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Sikerult kivenni a filamentet?" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 6065f2584..d7256df22 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -70,7 +70,7 @@ msgstr "Sempre" msgid "Ambient" msgstr "Ambiente" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" @@ -185,7 +185,7 @@ msgstr "Stato cinghie" msgid "Belt test" msgstr "Test cinghie" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -702,7 +702,7 @@ msgstr "Sensore fil." msgid "Filament" msgstr "Filamento" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -999,13 +999,13 @@ msgstr "" "Errore runtime interno. Provare a resettare l'unità MMU o ad aggiornare il " "FW. Se il problema persiste, contattare l'assistenza." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2364,7 +2364,7 @@ msgstr "Avviso: tipo di scheda madre cambiato" msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index e96cf6e96..593b3077c 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -70,7 +70,7 @@ msgstr "Altijd" msgid "Ambient" msgstr "Kamertemp." -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Zijn beide Z wagen heelemaal boven?" @@ -186,7 +186,7 @@ msgstr "Riem status" msgid "Belt test" msgstr "Riemtest" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -705,7 +705,7 @@ msgstr "Fil. sensor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -1001,13 +1001,13 @@ msgstr "" "Interne runtime fout. Probeer de MMU-eenheid te resetten of de firmware bij " "te werken. Als het probleem aanhoudt, neem dan contact op met support." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Is filament geladen?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2367,7 +2367,7 @@ msgstr "Waarschuwing: type moederbord gewijzigd." msgid "Warning: printer type changed." msgstr "Waarschuwing: printertype gewijzigd." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Is filament succes- vol verwijderd?" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 463d50155..56c6169c3 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -70,7 +70,7 @@ msgstr "Alltid" msgid "Ambient" msgstr "Omgivelse" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Er venstre og høyre Z-vogn helt oppe?" @@ -186,7 +186,7 @@ msgstr "Beltestatus" msgid "Belt test" msgstr "Belte test" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -703,7 +703,7 @@ msgstr "Fil. Sensor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -992,13 +992,13 @@ msgstr "" "Intern runtime feil. Prøv omstart av MMU enheten eller oppdater fastvaren. " "Hvis feilen vedvarer, kontakt kundestøtte." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Er filament lastet?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2337,7 +2337,7 @@ msgstr "Advarsel: Hovedkortype forandret." msgid "Warning: printer type changed." msgstr "Advarsel: Printertype forandret." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Ble filamentet lastet helt ut?" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 74cd16212..25ca22143 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -70,7 +70,7 @@ msgstr "Zawsze" msgid "Ambient" msgstr "Otoczenie" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" @@ -185,7 +185,7 @@ msgstr "Stan paskow" msgid "Belt test" msgstr "Test paskow" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -702,7 +702,7 @@ msgstr "Czuj. filam." msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -991,13 +991,13 @@ msgstr "" "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW. Skontaktuj sie z " "pomoca techniczna, jeśli problem nadal występuje." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2346,7 +2346,7 @@ msgstr "Ostrzezenie: plyta glowna ulegla zmianie." msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 156e4897a..eee117045 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -70,7 +70,7 @@ msgstr "Mereu" msgid "Ambient" msgstr "Ambiental" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Este axa Z aliniata sus?" @@ -187,7 +187,7 @@ msgstr "Status curele" msgid "Belt test" msgstr "Test curele" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -705,7 +705,7 @@ msgstr "Senzor Fil." msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -999,13 +999,13 @@ msgstr "" "ERR de rulare interna. Incercati sa resetati unitatea MMU sau actualizati " "firmwarul. Daca problema persista, contactati dep. support" -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Este filamentul incarcat?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2357,7 +2357,7 @@ msgstr "Atentie: tipul placii de baza s-a schimbat." msgid "Warning: printer type changed." msgstr "Atentie: tipul imprimantei s-a schimbat." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Filamentul a fost scos cu succes?" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index bf9f2c874..df70270b1 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -70,7 +70,7 @@ msgstr "Vzdy" msgid "Ambient" msgstr "Okolie" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Dosli oba Z voziky k hornemu dorazu?" @@ -185,7 +185,7 @@ msgstr "Stav remena" msgid "Belt test" msgstr "Test remena" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -702,7 +702,7 @@ msgstr "Fil. senzor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -995,13 +995,13 @@ msgstr "" "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware. Ak chyba " "pretrvava, kontaktujte podporu." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Je filament zavedeny?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2347,7 +2347,7 @@ msgstr "Varovanie: doslo k zmene typu maticnej dosky." msgid "Warning: printer type changed." msgstr "Varovanie: doslo k zmene typu tlaciarne." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Bolo vysunutie filamentu uspesne?" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index a4e21da0a..dd11a610d 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -70,7 +70,7 @@ msgstr "Alltid" msgid "Ambient" msgstr "Omgivande" -#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2974 msgid "Are left and right Z~carriages all up?" msgstr "Är båda Z-vagnarna helt uppe?" @@ -186,7 +186,7 @@ msgstr "Bält status" msgid "Belt test" msgstr "Bält test" -#. MSG_RECOVER_PRINT c=20 r=2 +#. MSG_RECOVER_PRINT c=20 r=3 #: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" @@ -702,7 +702,7 @@ msgstr "Fil. sensor" msgid "Filament" msgstr "Filament" -#. MSG_FILAMENT_CLEAN c=20 r=2 +#. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 msgid "Filament extruding & with correct color?" @@ -999,13 +999,13 @@ msgstr "" "Internt körtidsfel. Prova återställa MMU-enheten eller uppdatera firmware. " "Kontakta supporten om problemet kvarstår." -#. MSG_FILAMENT_LOADED c=20 r=2 +#. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 #: ../../Firmware/ultralcd.cpp:4063 msgid "Is filament loaded?" msgstr "Är filament laddat?" -#. MSG_STEEL_SHEET_CHECK c=20 r=2 +#. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 #: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 msgid "Is steel sheet on heatbed?" @@ -2357,7 +2357,7 @@ msgstr "Varning: moderkortstyp ändrad." msgid "Warning: printer type changed." msgstr "Varning: skrivartyp ändrats." -#. MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#. MSG_UNLOAD_SUCCESSFUL c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3571 msgid "Was filament unload successful?" msgstr "Lyckades filamentutmatningen?" From 03778226ca0ae1447192be2a324fecb4e209dca5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 12:42:44 +0100 Subject: [PATCH 025/240] Remove `Select Extruder:` message Post fix PR4064 for update.po*.py scripts --- Firmware/messages.cpp | 1 - Firmware/messages.h | 1 - lang/po/Firmware.pot | 1225 ++++++++++++++++---------------- lang/po/Firmware_cs.po | 1286 ++++++++++++++++++---------------- lang/po/Firmware_de.po | 1510 +++++++++++++++++++++------------------- lang/po/Firmware_es.po | 1293 +++++++++++++++++----------------- lang/po/Firmware_fr.po | 1401 +++++++++++++++++++------------------ lang/po/Firmware_hr.po | 1284 ++++++++++++++++++---------------- lang/po/Firmware_hu.po | 1291 ++++++++++++++++++---------------- lang/po/Firmware_it.po | 1277 +++++++++++++++++---------------- lang/po/Firmware_nl.po | 1301 +++++++++++++++++----------------- lang/po/Firmware_no.po | 1285 ++++++++++++++++++---------------- lang/po/Firmware_pl.po | 1390 ++++++++++++++++++------------------ lang/po/Firmware_ro.po | 1303 +++++++++++++++++----------------- lang/po/Firmware_sk.po | 1278 ++++++++++++++++++---------------- lang/po/Firmware_sv.po | 1283 ++++++++++++++++++---------------- 16 files changed, 9631 insertions(+), 8778 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 326bcc5b2..d5a57303d 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -49,7 +49,6 @@ const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////MSG_HEATING c=20 const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////MSG_HEATING_COMPLETE c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////MSG_HOMEYZ c=18 const char MSG_ITERATION[] PROGMEM_I1 = ISTR("Iteration"); ////MSG_ITERATION c=12 -const char MSG_SELECT_EXTRUDER[] PROGMEM_I1 = ISTR("Select extruder:"); ////MSG_SELECT_EXTRUDER c=20 const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_SELECT_FILAMENT c=20 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 diff --git a/Firmware/messages.h b/Firmware/messages.h index fa6c08a81..276bab0a7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -55,7 +55,6 @@ extern const char MSG_HEATING[]; extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; extern const char MSG_ITERATION[]; -extern const char MSG_SELECT_EXTRUDER[]; extern const char MSG_SELECT_FILAMENT[]; extern const char MSG_LAST_PRINT[]; extern const char MSG_LAST_PRINT_FAILURES[]; diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index f7bcb2fa0..be0e9c0c1 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -8,88 +8,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr "" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr "" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr "" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "" @@ -106,166 +105,166 @@ msgid "Avoiding grind" msgstr "" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." msgstr "" #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "" @@ -280,55 +279,55 @@ msgid "Changed correctly?" msgstr "" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "" @@ -338,12 +337,12 @@ msgid "Color not correct" msgstr "" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "" @@ -353,31 +352,31 @@ msgid "Cooldown" msgstr "" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -385,34 +384,34 @@ msgid "" msgstr "" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "" @@ -424,7 +423,7 @@ msgid "Disengaging idler" msgstr "" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -433,19 +432,19 @@ msgid "" msgstr "" #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" msgstr "" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "" @@ -479,8 +478,8 @@ msgid "ERROR:" msgstr "" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "" @@ -492,17 +491,17 @@ msgid "Ejecting filament" msgstr "" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "" @@ -514,121 +513,124 @@ msgid "Engaging idler" msgstr "" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "" +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "" @@ -657,25 +659,33 @@ msgid "Feeding to nozzle" msgstr "" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "" +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + #. MSG_FILAMENT_CLEAN c=20 r=3 #: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 #: ../../Firmware/ultralcd.cpp:2287 @@ -688,28 +698,28 @@ msgid "Filament not loaded" msgstr "" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -721,124 +731,124 @@ msgid "Filament used" msgstr "" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -846,16 +856,16 @@ msgid "" msgstr "" #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "" @@ -866,65 +876,65 @@ msgid "Homing" msgstr "" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "" #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." msgstr "" #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "" @@ -934,45 +944,50 @@ msgid "Insert filament" msgstr "" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU unit or updating the firmware." " If the issue persists, contact support." msgstr "" #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "" +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "" @@ -982,57 +997,57 @@ msgid "Left" msgstr "" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1042,185 +1057,210 @@ msgid "Loading color" msgstr "" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "" +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "" +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "" #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "" + #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "" +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + #. MSG_MEASURED_SKEW c=14 #: ../../Firmware/ultralcd.cpp:2528 msgid "Measured skew" msgstr "" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "" #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "" @@ -1231,97 +1271,111 @@ msgid "Moving selector" msgstr "" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "" #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "" #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "" +#. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +msgid "Nozzle diameter differs from the G-code. Continue?" +msgstr "" + +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +msgid "" +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." +msgstr "" + #. MSG_PROGRESS_OK c=4 #: ../../Firmware/mmu2_progress_converter.cpp:8 #: ../../Firmware/mmu2_progress_converter.cpp:34 @@ -1329,89 +1383,89 @@ msgid "OK" msgstr "" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." msgstr "" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "" @@ -1422,13 +1476,13 @@ msgid "Parking selector" msgstr "" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "" @@ -1439,120 +1493,120 @@ msgid "Performing cut" msgstr "" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "" #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "" #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "" #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "" #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "" #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "" @@ -1562,28 +1616,28 @@ msgid "Preheat the nozzle!" msgstr "" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "" #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "" @@ -1594,33 +1648,33 @@ msgid "Preparing blade" msgstr "" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "" #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "" @@ -1630,31 +1684,19 @@ msgid "Print time" msgstr "" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." msgstr "" -#. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 -msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "" - -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 -msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." -msgstr "" - #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" @@ -1665,66 +1707,66 @@ msgid "Pushing filament" msgstr "" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "" @@ -1735,7 +1777,7 @@ msgid "Retract from FINDA" msgstr "" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "" @@ -1751,81 +1793,81 @@ msgid "Right" msgstr "" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "" +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" msgstr "" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "" #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "" @@ -1835,57 +1877,64 @@ msgstr "" msgid "Selecting fil. slot" msgstr "" +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "" #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "" @@ -1895,13 +1944,13 @@ msgid "Severe skew" msgstr "" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1910,13 +1959,13 @@ msgid "" msgstr "" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "" @@ -1926,179 +1975,167 @@ msgid "Slight skew" msgstr "" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." msgstr "" #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "" -#. 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 "" - -#. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 -msgid "Thermal model not calibrated yet." -msgstr "" - #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." msgstr "" #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2106,31 +2143,43 @@ msgid "" msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" +#. MSG_TM_CAL c=20 r=4 +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" + +#. MSG_TM_NOT_CAL c=20 r=4 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +msgid "Thermal model not calibrated yet." +msgstr "" + #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "" @@ -2145,37 +2194,30 @@ msgid "Total print time" msgstr "" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" -" is free. Check FINDA connection." -msgstr "" - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "" @@ -2192,23 +2234,23 @@ msgid "Unloading to pulley" msgstr "" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "" #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2217,118 +2259,117 @@ msgid "" msgstr "" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "" #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "" #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" @@ -2338,34 +2379,34 @@ msgid "Y distance from min" msgstr "" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "" @@ -2375,34 +2416,34 @@ msgid "and press the knob" msgstr "" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 32a36ec88..1706495a2 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s ocekavana verze" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Doladeni Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Vse OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Vse je hotovo. Tisku zdar!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Okoli" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." @@ -107,7 +106,8 @@ msgstr "AutoZavedeni fil." msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" -"Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament." +"Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte " +"filament." #. MSG_PROGRESS_AVOID_GRIND c=20 #: ../../Firmware/mmu2_progress_converter.cpp:16 @@ -116,53 +116,53 @@ msgid "Avoiding grind" msgstr "Eliminace obrouseni" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Osa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Delka osy" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Zpet" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Podlozka" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Zahrivani bedu" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Bed OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Korekce podlozky" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,70 +170,70 @@ msgstr "" "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Podlozka/Topeni" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Stav remenu" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test remenu" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu. Obnovit tisk?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Podsviceni" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "CHYBA KOMUNIKACE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte " -"tlacitkem." +"Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte" +" tlacitkem." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibruji Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,44 +242,45 @@ msgstr "" "tlacitkem." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibruji vychozi p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibrace" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibrace OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Chyba pohybu selektoru nebo idleru" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "Nelze provest akci, filament je zaveden. Nejprve jej vyjmete." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Karta vyjmuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Vymente SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Vymenit filament" @@ -294,55 +295,55 @@ msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Kontrola osy X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Kontrola osy Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Kontrola osy Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Kontroluji soubor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Kontrola senzoru" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Kontrola" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Vymazat chybu TM" @@ -352,12 +353,12 @@ msgid "Color not correct" msgstr "Barva neni cista" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Komunitni prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Pokr." @@ -367,31 +368,31 @@ msgid "Cooldown" msgstr "Zchladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Det. narazu" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Detekovan naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -402,34 +403,34 @@ msgstr "" "Normal modu" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Ustrihnout" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Strihani" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Temny" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Vypnout" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Vypnout motory" @@ -441,31 +442,32 @@ msgid "Disengaging idler" msgstr "Odpojuji idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte podle " "manualu, kapitola Zaciname." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" msgstr "" -"Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?" +"Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a " +"podlozkou?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Konec" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Korekce E:" @@ -498,12 +500,6 @@ msgstr "ERR: Cekam na uziv." msgid "ERROR:" msgstr "CHYBA:" -#. MSG_EJECT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Vysunout fil." - #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate #: ../../Firmware/mmu2_progress_converter.cpp:27 @@ -512,17 +508,17 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Konc. spinace" @@ -534,125 +530,123 @@ msgid "Engaging idler" msgstr "Zapinani idleru" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Det. zaseku" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. runout" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT JE ZAVEDEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NESEPNULA" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"Při vyjmuti filamentu se nevypnula FINDA. Zkuste rucni vyjmuti. Ujistete se, " -"ze se filament nezasekl a FINDA funguje." +"Při vyjmuti filamentu se nevypnula FINDA. Zkuste rucni vyjmuti. Ujistete se," +" ze se filament nezasekl a FINDA funguje." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" -"FINDA se nesepnula pri zavadeni filamentu. Neni pohyb filamentu blokovan? Je " -"senzor ok?" +"FINDA se nesepnula pri zavadeni filamentu. Neni pohyb filamentu blokovan? Je" +" senzor ok?" #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ZASEK. FILAM." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS reakce" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "F. SENZOR NESEPNUL" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "F.SENZOR MOC BRZY" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENZOR ZASEK FILAM." #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME CHYBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Selhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Selhani MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falesne spusteni" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventilatoru" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Kontr. vent." @@ -681,22 +675,23 @@ msgid "Feeding to nozzle" msgstr "Zavadim do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -712,14 +707,14 @@ msgid "Filament not loaded" msgstr "Filament nezaveden" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Senzor filamentu" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -728,7 +723,7 @@ msgstr "" "filament muze pohybovat a senzor funguje." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -737,7 +732,7 @@ msgstr "" "filament dostal a ze senzor funguje." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -751,36 +746,37 @@ msgid "Filament used" msgstr "Spotrebovano filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Dokoncovani pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Kal. prvni vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri " "sestaveni tiskarny." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Prutok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -789,28 +785,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Predni tiskovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Vpredu [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Predni/levy vent." -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code je pripraven pro jinou verzi. Pokracovat?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -818,63 +814,63 @@ msgstr "" "G-code je pripraven pro jinou verzi. Vyslicujte model znovu. Tisk zrusen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code je pripraven pro jiny typ tiskarny.Pokracovat?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code je pripraven pro jiny typ tiskarny. Vyslicujte model znovu. Tisk " "zrusen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code je pripraven pro novejsi FW. Pokracovat?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "G-code je pripraven pro novejsi FW. Aktualizujte FW. Tisk zrusen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW nastaveni" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Zahrivani" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Zahrivani OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -884,7 +880,7 @@ msgstr "" "nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -893,9 +889,9 @@ msgstr "" "kalibracnim procesem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Vys. vykon" @@ -906,48 +902,48 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" 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:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Vent. hotendu:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER: CHYBA HOMINGU" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "CHYBA POHYBU IDLERU" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "NEPLATNY NASTROJ" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -956,17 +952,17 @@ msgstr "" "Tiskove platy" #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Upresnovani kalibracniho bodu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Informace" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Zav. SD karty" @@ -976,47 +972,47 @@ msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW. Pokud pretrvava, " "kontakujte tech. podporu." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Je filament zaveden?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Opakovani" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Posledni tisk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Selhani posl. tisku" @@ -1026,57 +1022,57 @@ msgid "Left" msgstr "Vlevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Vlevo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Normalni" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Ztlumeny" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Korekce lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Doladeni osy Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Nacist vse" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Zavest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Zavest do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1086,69 +1082,70 @@ msgid "Loading color" msgstr "Cisteni barvy" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Zavadeni filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Uvolnena remenicka" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Hlasity" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "AKTUALIZUJTE MMU FW" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interni chyba MMU FW, resetujte MMU" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NEODPOVIDA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU opakovani: Obnova teploty..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST SELAHL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Selhani MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU selhani zav" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1157,7 +1154,7 @@ msgstr "" "pretrvavaji, kontaktujte podporu." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1166,23 +1163,23 @@ msgstr "" "pretrvavaji, kontaktujte podporu." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 pripojeno" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Hlavni nabidka" @@ -1192,83 +1189,84 @@ msgid "Measured skew" msgstr "Merene zkos." #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Probiha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Vice info na webu" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Posunout X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Posunout Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Posunout Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Posunout osu" @@ -1279,94 +1277,96 @@ msgid "Moving selector" msgstr "Presun selektoru" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Vysla nova verze FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Zadna SD karta" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Zadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nezapojeno" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Netoci se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Nyni zkalibruji vzdalenost mezi koncem trysky a povrchem podlozky." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Výměna trysek" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Tryska" @@ -1377,82 +1377,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Vyp" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Jednou" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "STOP: CHYBA TEPLOTY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibrace" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Nahrivani PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA kalibrace selhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1461,7 +1461,7 @@ msgstr "" "menu Nastaveni->Tepl. kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "KLADKA SE NEOTACI" @@ -1472,13 +1472,13 @@ msgid "Parking selector" msgstr "KLADKA SE NEOTACI" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pozastavit tisk" @@ -1489,7 +1489,7 @@ msgid "Performing cut" msgstr "Provadim rez" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1498,7 +1498,7 @@ msgstr "" "prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1507,33 +1507,33 @@ msgstr "" "restartovanim tiskarny." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Zkontrolujte zapojeni IR senzoru a vyjmuty filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Zkontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Ocistete podlozku a stisknete tlacitko." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete trysku. Potvrdte tlacitkem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Vlozte filament do extruderu a stiskem tlacitka jej zavedete." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1541,73 +1541,73 @@ msgstr "" "Vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Nejdriv zavedte filament" #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Otevrete idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Umistete tiskovy plat na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete tlacitko" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Vyjmete urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Nejprve sundejte transportni soucastky." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante tiskovy plat z podlozky." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Vyjmete filament a zopakujte tuto akci" #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Prosim aktualizujte." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Cekejte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Vypadky proudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Predehrev" @@ -1617,28 +1617,28 @@ msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Vyckejte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Predehrev ke strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Predehrev k zavedeni" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" @@ -1649,33 +1649,33 @@ msgid "Preparing blade" msgstr "Pripravuji cepel" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Stisknete tlacitko" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Tisk prerusen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Tiskovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Tisk z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Tisk pozastaven" @@ -1685,35 +1685,35 @@ msgid "Print time" msgstr "Cas tisku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "IP adr. tiskarny:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Tiskarna nebyla jeste zkalibrovana. Postupujte podle manualu, kapitola " "Zaciname." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Prumer trysky tiskarny se lisi od G-code. Zkontrolujte nastaveni. Tisk " "zrusen." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Kladkový motor se zastavil. Ujistete se, ze neni pohyb blokovan a " @@ -1726,37 +1726,37 @@ msgid "Pushing filament" msgstr "Posun filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "FRONTA PLNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Vzadu [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Obnovovani tisku" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Prejmenovat" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1765,29 +1765,24 @@ msgstr "" "nastrojovy index mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Obnoveni tisku" @@ -1798,7 +1793,7 @@ msgid "Retract from FINDA" msgstr "Vysouvani od FINDy" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Znovu" @@ -1814,12 +1809,12 @@ msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Vpravo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1828,69 +1823,64 @@ msgstr "" "kalibracni proces od zacatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD karta" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELEKTOR: HOMING ERR" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SE NEHYBE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ZASTAVENO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Vyberte extruder:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." @@ -1901,56 +1891,56 @@ msgid "Selecting fil. slot" msgstr "Vyber fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Start Selftestu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Chyba Selftestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Selftest selhal" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Nastaveni" @@ -1960,13 +1950,13 @@ msgid "Severe skew" msgstr "Tezke zkos." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Plat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,13 +1969,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Tichy" @@ -1995,7 +1985,7 @@ msgid "Slight skew" msgstr "Lehke zkos." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2004,127 +1994,126 @@ msgstr "" "setrideni je 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Trideni" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Trideni souboru" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Toci se" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Tiskove platy" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Zastavit tisk" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Prohozene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "TEPLOTNI VYJIMKA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "CHYBA TMC DRIVER" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC RESET DRIVERU" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER: ZKRAT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC CHYBA: PREHRATI" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC CHYBA NIZKE NAP." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2133,44 +2122,35 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Termálního model zatím nebyl kalibrován." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Testovani filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -"Idler nemuze najit vych. pozici. Zkontrolujte, zda neco neblokuje jeho pohyb." - -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"MMU hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v MMU " -"aktualni FW." +"Idler nemuze najit vych. pozici. Zkontrolujte, zda neco neblokuje jeho " +"pohyb." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2178,7 +2158,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2188,7 +2168,7 @@ msgstr "" "vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2196,24 +2176,24 @@ msgstr "" "Je potreba kalibrovat osu Z. Postupujte dle prirucky, kapitola Zaciname." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Celkem" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Celkem selhani" @@ -2228,39 +2208,30 @@ msgid "Total print time" msgstr "Celkovy cas tisku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Ladit" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "MANUALNI VYJMUTI" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"FINDA hlasi neocekavanou hodnotu. Ujistete ze, ze v senzoru neni filament a " -"selektor se muze hybat. Zkontrolujte zapojeni." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Vyjmout" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Vyjmout filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Vysouvam filament" @@ -2277,23 +2248,23 @@ msgid "Unloading to pulley" msgstr "Vysunuti ke kladce" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Napeti" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "TMC: VYSOKA TEPLOTA!" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2306,120 +2277,121 @@ msgstr "" "Stealth modu" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Ceka se na uzivatele" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Varovat" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Varovani: doslo ke zmene typu tiskarny a motherboardu." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Chyba zapojeni" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Pruvodce" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Korekce X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." -msgstr "Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." +msgstr "" +"Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" -"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." +"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte " +"tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" @@ -2429,34 +2401,34 @@ msgid "Y distance from min" msgstr "Y vzdalenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Korekce Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete znovu spustit z menu Kalibrace -> Pruvodce." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Korekce Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Pocet mereni Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -2466,38 +2438,131 @@ msgid "and press the knob" msgstr "a stisknete tlacitko" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "k zavedeni filamentu" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "k vyjmuti filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "neznamy" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "neznamy stav" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Obnovit" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU vyp. proudu" + +#. MSG_EJECT_FROM_MMU c=16 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +msgid "Eject from MMU" +msgstr "" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Eject filament" +#~ msgstr "Vysunout fil." + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Vyberte extruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v MMU " +#~ "aktualni FW." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "FINDA hlasi neocekavanou hodnotu. Ujistete ze, ze v senzoru neni filament a " +#~ "selektor se muze hybat. Zkontrolujte zapojeni." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2552,9 +2617,6 @@ msgstr "🔃Obnovit" #~ msgid "MMU needs user attention." #~ msgstr "MMU potrebuje zasah uzivatele." -#~ msgid "MMU power fails" -#~ msgstr "MMU vyp. proudu" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Prosim vyjmete filament a pote stisknete tlacitko." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 0cee3806a..7a6ccd974 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -16,97 +16,98 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 -#: ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 oder älter" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 -#: ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s Level erwartet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Abbruch" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Z Anpassen:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Alles richtig" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spaß beim Drucken!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Immer" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Raumtemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Startposition" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Auto Leist" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "AutoLaden Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 #: ../../Firmware/ultralcd.cpp:2294 -msgid "Autoloading filament is active, just press the knob and insert filament..." +msgid "" +"Autoloading filament is active, just press the knob and insert filament..." msgstr "" -"Automatisches Fila- ment Laden ist aktiv , Knopf drücken und Filament einlegen..." +"Automatisches Fila- ment Laden ist aktiv , Knopf drücken und Filament " +"einlegen..." #. MSG_PROGRESS_AVOID_GRIND c=20 #: ../../Firmware/mmu2_progress_converter.cpp:16 @@ -115,170 +116,174 @@ msgid "Avoiding grind" msgstr "Vermeide schleifen" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Achse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Achsenlänge" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Zurück" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Bett" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Bett aufwärmen" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Bett OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Bett Level Korr." #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" -"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset." +"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " +"reset." msgstr "" -"Z-Kal. fehlgeschlg. Sensor nicht ausgelöst. Schmutzige Düse? Warte auf Reset." +"Z-Kal. fehlgeschlg. Sensor nicht ausgelöst. Schmutzige Düse? Warte auf " +"Reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Bett/Heizung" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Gurtstatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Riementest" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Hell" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Helligkeit" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEHLER" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrierung Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" -"Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. " -"Click when done." +"Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " +"stoppers. Click when done." msgstr "" "XYZ Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. " "Anschliessend den Knopf drücken." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibriere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " -"Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end " +"stoppers. Click when done." msgstr "" "Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. " "Anschliessend den Knopf drücken." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibriere Start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibrierung" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibrierung OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Kann Selektor oder Riemenscheibe nicht bewegen." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Die Aktion kann nicht ausgeführt werden, das Filament ist bereits geladen. " "Entladen Sie es zuerst." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "SD Karte entfernt" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Wechsel SD Karte" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Filament-Wechsel" @@ -293,55 +298,55 @@ msgid "Changed correctly?" msgstr "Wechsel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Prüfe X Achse" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Prüfe Y Achse" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Prüfe Z Achse" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Prüfe Bett" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Prüfe Endschalter" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Überprüfe Datei" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Prüfe Düse" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Prüfe Sensoren" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Kontrolle" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "TM Fehler löschen" @@ -351,12 +356,12 @@ msgid "Color not correct" msgstr "Falsche Farbe" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Von der Community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Weit." @@ -366,31 +371,31 @@ msgid "Cooldown" msgstr "Abkühlen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Gewählte Sprache kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Crash Erk." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash erkannt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -401,34 +406,34 @@ msgstr "" "genutzt werden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Fil. schneiden" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Messer" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Dimm" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Motoren aus" @@ -440,29 +445,31 @@ msgid "Disengaging idler" msgstr "Spannrol. auskuppeln" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer calibration." +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " +"calibration." msgstr "" "Der Abstand zwischen der Spitze der Düse und dem Bett ist noch nicht " "eingestellt. Folgen Sie dem Handbuch, Kapitel Erste Schritte." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" -"Do you want to repeat last step to readjust distance between nozzle and heatbed?" +"Do you want to repeat last step to readjust distance between nozzle and " +"heatbed?" msgstr "" "Willst du den letzten Schritt wiederholen, um den Abstand neu einzustellen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-Korrektur:" @@ -495,12 +502,6 @@ msgstr "FEHL. Warte Benutzer" msgid "ERROR:" msgstr "FEHLER:" -#. MSG_EJECT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Filamentauswurf" - #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate #: ../../Firmware/mmu2_progress_converter.cpp:27 @@ -509,17 +510,17 @@ msgid "Ejecting filament" msgstr "Werfe Filament aus" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Endanschlag" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Ende nicht getroffen" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Endschalter" @@ -531,125 +532,123 @@ msgid "Engaging idler" msgstr "Spannrol. einkuppeln" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder Info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F. Stau entd." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "FS. Auslauf" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FIL. BEREITS GELADEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA N. AUSGELÖST" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" -"FINDA didn't switch off while unloading filament. Try unloading manually. Ensure " -"filament can move and FINDA works." +"FINDA didn't switch off while unloading filament. Try unloading manually. " +"Ensure filament can move and FINDA works." msgstr "" "FINDA nicht ausgeschaltet beim Entladen. Fil. manuell entladen. Fil. bewegt " "sich? FINDA funktioniert?" #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can move " -"and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can " +"move and FINDA works." msgstr "" -"FINDA hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, dass " -"sich das Filament bewegen kann und FINDA funktioniert." +"FINDA hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, dass" +" sich das Filament bewegen kann und FINDA funktioniert." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA NICHT FIL.FREI" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS Aktion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR N. AUSGELÖST" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR ZU FRÜH" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR N. FIL.FREI" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW-LAUFZEITFEHLER" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Fehlerstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "MMU-Fehler" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falschtriggerung" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Lüfter-Tempo" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Lüftertest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Lüfter Check" @@ -678,22 +677,23 @@ msgid "Feeding to nozzle" msgstr "Zufuhr zur Düse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. Mängel" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -709,38 +709,39 @@ msgid "Filament not loaded" msgstr "Fil. nicht geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Filamentsensor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" -"Filament sensor didn't switch off while unloading filament. Ensure filament can " -"move and the sensor works." +"Filament sensor didn't switch off while unloading filament. Ensure filament " +"can move and the sensor works." msgstr "" -"FSens. beim Entladen nicht abgeschaltet. Sicherstellen: Fil. bewegbar und Sensor " -"funktioniert?" +"FSens. beim Entladen nicht abgeschaltet. Sicherstellen: Fil. bewegbar und " +"Sensor funktioniert?" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the filament " -"reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the " +"filament reached the fsensor and the sensor works." msgstr "" -"Der FSensor hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, " -"dass das Filament den Sensor erreicht hat und der Sensor funktioniert." +"Der FSensor hat beim Laden des Filaments nicht ausgelöst. Stellen Sie " +"sicher, dass das Filament den Sensor erreicht hat und der Sensor " +"funktioniert." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" -"Filament sensor triggered too early while loading to extruder. Check there isn't " -"anything stuck in PTFE tube. Check that sensor reads properly." +"Filament sensor triggered too early while loading to extruder. Check there " +"isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Der FSensor wurde beim Laden in den Extruder zu früh ausgelöst. Prüfen Sie, dass " -"nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." +"Der FSensor wurde beim Laden in den Extruder zu früh ausgelöst. Prüfen Sie, " +"dass nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -748,36 +749,37 @@ msgid "Filament used" msgstr "Filament benutzt" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollständig Trotzdem fortfahren?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Bewegung beenden" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Erste-Schicht Kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Zunächst führe ich den Selbsttest durch, um die häufigsten Probleme beim " "Zusammenbau zu überprüfen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Durchfluss" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -786,116 +788,117 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Drucklüfter?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Vorne [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Druck/Extr. Lüfter" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. Druck " -"abgebrochen." +"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. " +"Druck abgebrochen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut. " "Druck abgebrochen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" -"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code sliced for a newer firmware. Please update the firmware. Print " +"cancelled." msgstr "" -"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. Druck " -"abgebrochen." +"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. " +"Druck abgebrochen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW Einstellungen" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Aufwärmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Aufwärmen OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" -"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup " -"process, in which the Z-axis will be calibrated. Then, you will be ready to " -"print." +"Hi, I am your Original Prusa i3 printer. I will guide you through a short " +"setup process, in which the Z-axis will be calibrated. Then, you will be " +"ready to print." msgstr "" -"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen " -"Einrichtungs- prozess führen, bei dem die Z-Achse kalibriert wird. Danach können " -"Sie drucken." +"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen " +"kurzen Einrichtungs- prozess führen, bei dem die Z-Achse kalibriert wird. " +"Danach können Sie drucken." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" -"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through " -"the setup process?" +"Hi, I am your Original Prusa i3 printer. Would you like me to guide you " +"through the setup process?" msgstr "" -"Hallo, ich bin Ihr Original Prusa i3 Drucker. Möchten Sie, dass ich Sie durch " -"den Einricht- ungsablauf führe?" +"Hallo, ich bin Ihr Original Prusa i3 Drucker. Möchten Sie, dass ich Sie " +"durch den Einricht- ungsablauf führe?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Hohe leist" @@ -906,68 +909,69 @@ msgid "Homing" msgstr "Startposition" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend bei 280C! Düse gewechselt, gemäß Spezifikation angezogen?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend-Lüfter:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" -"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 Min.dauern." +"Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 " +"Min.dauern." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchführen." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "SPANNRO. STARTP.FEH." #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "SPANNROL. SITZT FEST" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "UNGÜLTIGER FIL.PLATZ" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - HW " -"Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - " +"HW Setup - Steel sheets." msgstr "" -"Wenn Sie zusätzliche Stahlbleche haben, kalibrieren Sie deren Vorein- stellungen " -"unter Einstellungen - HW Setup - Stahlbleche." +"Wenn Sie zusätzliche Stahlbleche haben, kalibrieren Sie deren Vorein- " +"stellungen unter Einstellungen - HW Setup - Stahlbleche." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Verbesserung des Bettkalibrierungs- punkts" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Infoanzeige" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. SD Karte" @@ -977,48 +981,49 @@ msgid "Insert filament" msgstr "Filament einlegen" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" -"Insert the filament (do not load it) into the extruder and then press the knob." +"Insert the filament (do not load it) into the extruder and then press the " +"knob." msgstr "" -"Stecken Sie das Filament (nicht laden) in den Extruder und drücken Sie dann den " -"Knopf." +"Stecken Sie das Filament (nicht laden) in den Extruder und drücken Sie dann " +"den Knopf." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. If " -"the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" -"Interner Laufzeitfehler. MMU-Einheit zurücksetzen oder Firmware aktualisieren. " -"Ansonsten Support kontaktieren." +"Interner Laufzeitfehler. MMU-Einheit zurücksetzen oder Firmware " +"aktualisieren. Ansonsten Support kontaktieren." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Wiederholung" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Letzter Druck" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Letzte Druckfehler" @@ -1028,57 +1033,57 @@ msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Extruderlüfter?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Links [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Hell.wert" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Dimmwert" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Lineare Korrektur" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Z einstellen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Alle laden" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "In Düse laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1088,103 +1093,105 @@ msgid "Loading color" msgstr "Lade Farbe" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/mmu2_progress_converter.cpp:51 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Filament lädt" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Lose Riemenscheibe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Laut" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NÖTIG" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware Fehler, setzen Sie die MMU zurück." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU Mod." #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU REAGIERT NICHT" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU-Neuversuch: Wiederherstelle die Temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELBSTTEST FEHL." #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU Fehler" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU Ladefehler" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the issue " -"persists, contact support." +"MMU unit not responding correctly. Check the wiring and connectors. If the " +"issue persists, contact support." msgstr "" -"MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die Anschlüsse. " -"Wenn das Problem weiterhin besteht, wenden Sie sich an den Support." +"MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die " +"Anschlüsse. Wenn das Problem weiterhin besteht, wenden Sie sich an den " +"Support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue persists, " -"contact support." +"MMU unit not responding. Check the wiring and connectors. If the issue " +"persists, contact support." msgstr "" -"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn das " -"Problem weiterhin besteht, wenden Sie sich an den Support." +"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn" +" das Problem weiterhin besteht, wenden Sie sich an den Support." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 verbunden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnet Komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Hauptmenü" @@ -1194,83 +1201,84 @@ msgid "Measured skew" msgstr "Schräglauf" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 ../../Firmware/mesh_bed_calibration.cpp:2836 -#: ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhöhe des Kalibrierpunktes" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Gitter" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Moduswechsel erfolgt..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Weiter Details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Bewege X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Bewege Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Bewege Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Achse bewegen" @@ -1281,94 +1289,96 @@ msgid "Moving selector" msgstr "Bewege Selektor" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/V" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Neue Firmware- Version verfügbar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nein" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Keine SD Karte" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Keine Bewegung." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Ohne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nicht angeschlossen" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Dreht sich nicht" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt kalibriere ich den Abstand zwischen Düsenspitze und Druckbett." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Düse für PLA vorheizen." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Düse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Düsenwechsel" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Düsen Dia." @@ -1379,91 +1389,92 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Aus" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." +msgstr "" +"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "An" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Einmal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE THERM. FEHLER" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID Kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID Kalib. fertig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID Kalibrierung" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA erwärmen" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA Kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA-Kalibrierung fehlgeschlagen" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu Settings-" -">PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu " +"Settings->PINDA cal." msgstr "" -"PINDA Kalibrierung ist fertig + aktiv. Es kann ausge- schaltet werden im Menü " -"Einstellungen -> PINDA kal." +"PINDA Kalibrierung ist fertig + aktiv. Es kann ausge- schaltet werden im " +"Menü Einstellungen -> PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "RIEHMENS. SITZT FEST" @@ -1474,13 +1485,13 @@ msgid "Parking selector" msgstr "Parke Selektor" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Druck pausieren" @@ -1491,126 +1502,129 @@ msgid "Performing cut" msgstr "Führe Schnitt aus" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Legen Sie ein Blatt Papier unter die Düse während der Kalibrierung der ersten 4 " -"Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." +"Legen Sie ein Blatt Papier unter die Düse während der Kalibrierung der " +"ersten 4 Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" -"Lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit dem " -"Assistenten fort, indem Sie den Drucker neu starten." +"Lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit " +"dem Assistenten fort, indem Sie den Drucker neu starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "IR Sensor Verbindungen über- prüfen. Ist Filament entladen?" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Prüfen:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Reinigen Sie das Heizbett und drücken Sie dann den Knopf." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." -msgstr "Entfernen Sie überstehendes Filament von der Düse. Klicken wenn sauber." +msgstr "" +"Entfernen Sie überstehendes Filament von der Düse. Klicken wenn sauber." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 -msgid "Please insert filament into the extruder, then press the knob to load it." +#: ../../Firmware/ultralcd.cpp:3795 +msgid "" +"Please insert filament into the extruder, then press the knob to load it." msgstr "" -"Legen Sie Fil. in den Extruder ein und drücken Sie dann den Knopf,um zu laden." +"Legen Sie Fil. in den Extruder ein und drücken Sie dann den Knopf,um zu " +"laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob to " -"load it." +"Please insert filament into the first tube of the MMU, then press the knob " +"to load it." msgstr "" -"Stecken Sie das Filament in den ersten Schlauch der MMU. Drücken Sie dann den " -"Knopf, um es zu laden." +"Stecken Sie das Filament in den ersten Schlauch der MMU. Drücken Sie dann " +"den Knopf, um es zu laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Laden Sie zuerst das Filament." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Spannrolle öffnen und Filament von Hand entfernen" #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Legen Sie das Stahlblech auf das Heizbett." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Drücken Sie den Knopf um das Filament zu entladen." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Ziehen Sie das Filament sofort heraus" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Zuerst Transportsicherungen entfernen." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Entfernen Sie das Stahlblech vom Heizbett." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Zuerst XYZ Kalibrierung ausführen." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Entladen Sie erst das Filament und versuchen Sie es nochmal." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Bitte aktualisieren." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Warten" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Netzfehler" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Vorheizen" @@ -1620,28 +1634,28 @@ msgid "Preheat the nozzle!" msgstr "Düse vorheizen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Düse. Bitte warten." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Heizen zum Laden" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Heizen zum Entladen" @@ -1652,33 +1666,33 @@ msgid "Preparing blade" msgstr "Bereite Messer vor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Knopf drücken zum" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Druck abgebrochen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Drucklüfter:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Drucken von SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Druck pausiert" @@ -1688,35 +1702,35 @@ msgid "Print time" msgstr "Druckzeit" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Drucker IP Adr.:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Drucker wurde noch nicht kalibriert. Folgen Sie dem Handbuch, Kapitel Erste " "Schritte." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" -"Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie den " -"Wert in den Einstellungen. Druck abgebrochen." +"Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie " +"den Wert in den Einstellungen. Druck abgebrochen." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Der Riemenscheiben- motor ist blockiert. Sicherstellen, dass sich die " @@ -1729,69 +1743,65 @@ msgid "Pushing filament" msgstr "Schiebe Filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "QUEUE VOLL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Hinten [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Druck wiederherst" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Entfernen Sie das alte Filament und drücken Sie den Knopf, um das neue zu laden." +"Entfernen Sie das alte Filament und drücken Sie den Knopf, um das neue zu " +"laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Umbenennen" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" -"Requested filament tool is not available on this hardware. Check the G-code for " -"tool index out of range (T0-T4)." +"Requested filament tool is not available on this hardware. Check the G-code " +"for tool index out of range (T0-T4)." msgstr "" -"Der angeforderte Filamentplatz ist auf dieser Hardware nicht verfügbar. Prüfen " -"Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." +"Der angeforderte Filamentplatz ist auf dieser Hardware nicht verfügbar. " +"Prüfen Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Druck fortsetzen" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Druck fortgesetzt" @@ -1802,7 +1812,7 @@ msgid "Retract from FINDA" msgstr "Einziehen von FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Wdh." @@ -1818,12 +1828,12 @@ msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Rechts [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1832,71 +1842,66 @@ msgstr "" "beginnen. Fortfahren?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD Karte" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELEK. STARTPOSFEHL." #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SITZT FEST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "GESTOPPT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Auswahl" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" -"Select a filament for the First Layer Calibration and select it in the on-screen " -"menu." +"Select a filament for the First Layer Calibration and select it in the on-" +"screen menu." msgstr "" -"Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es im " -"On-Screen-Menü aus." - -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Wähle extruder:" +"Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es" +" im On-Screen-Menü aus." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Wähle filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Wähle Sprache" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vorheiztemperatur auswählen, die Ihrem Material entspricht." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Wählen Sie die Temperatur, die zu Ihrem Material passt." @@ -1907,56 +1912,56 @@ msgid "Selecting fil. slot" msgstr "Wähle Filament Platz" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Selbsttest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Selbsttest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selbsttest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Selbsttest Fehler!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Selbsttest Error" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest wird gestartet, um Startposition zu kalibrieren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Sensor Info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensor überprüft, entladen Sie jetzt das Filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Temp. einstellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Einstellungen" @@ -1966,13 +1971,13 @@ msgid "Severe skew" msgstr "Sehr schräg" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Stahlblech" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1985,13 +1990,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Endschalter Status" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Leise" @@ -2001,134 +2006,135 @@ msgid "Slight skew" msgstr "Leicht schräg" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" -"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." +"Some files will not be sorted. Max. No. of files in 1 folder for sorting is " +"100." msgstr "" "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sortiere Dateien" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Ton" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Geschwindigkeit" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Dreht sich" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." +msgstr "" +"Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistiken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Leise" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Stahlbleche" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Druck abbrechen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Ausgetauscht" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC TREIBER FEHLER" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC TREIBER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC KURZSCHLUSS" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC ÜBERHITZ.FEHL." #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNTERSPANN.FEHL." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2137,83 +2143,78 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Thermomodell noch unkalibriert." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Teste filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "The Idler cannot home properly. Check for anything blocking its movement." -msgstr "" -"Die Spannrolle kann die Startposition nicht richtig erreichen. Prüfen Sie, ob " -"irgendetwas seine Bewegung blockiert." - -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" -"The MMU unit reports its FW version incompatible with the printer's firmware. " -"Make sure the MMU firmware is up to date." -msgstr "MMU meldet Inkompatibilität FW. Stell sicher, dass MMU-FW aktuell ist." +"The Idler cannot home properly. Check for anything blocking its movement." +msgstr "" +"Die Spannrolle kann die Startposition nicht richtig erreichen. Prüfen Sie, " +"ob irgendetwas seine Bewegung blockiert." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "Selektor erreicht Startpos. nicht. Prüf, ob etwas blockiert." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" -"The printer will start printing a zig-zag line. Rotate the knob until you reach " -"the optimal height. Check the pictures in the handbook (Calibration chapter)." +"The printer will start printing a zig-zag line. Rotate the knob until you " +"reach the optimal height. Check the pictures in the handbook (Calibration " +"chapter)." msgstr "" -"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, " -"bis Sie die optimale Höhe erreicht haben. Überprüfen Sie die Bilder im Handbuch." +"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den " +"Knopf, bis Sie die optimale Höhe erreicht haben. Überprüfen Sie die Bilder " +"im Handbuch." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, chapter " -"First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, " +"chapter First steps, section Calibration flow." msgstr "" -"Die Z-Kalibrierung is noch notwendig. Folgen Sie dem Handbuch, Kapitel Erste " -"Schritte." +"Die Z-Kalibrierung is noch notwendig. Folgen Sie dem Handbuch, Kapitel Erste" +" Schritte." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Zeit" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Gesamt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Gesamte Fehler" @@ -2228,38 +2229,30 @@ msgid "Total print time" msgstr "Gesamte Druckzeit" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Feineinstellung" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "ENTLADE MANUELL" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector is " -"free. Check FINDA connection." -msgstr "" -"Unerwarteter FINDA-Wert. Stellen Sie sicher, dass sich kein Filament unter FINDA " -"befindet und der Selektor frei ist. Prüfen Sie die FINDA-Verbindung." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Entla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Fil. entladen" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/mmu2_progress_converter.cpp:50 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Filament auswerfen" @@ -2276,24 +2269,25 @@ msgid "Unloading to pulley" msgstr "Entlade zur Riemens." #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "" -"Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals versuchen." +"Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals " +"versuchen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Spannungen" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "WARNUNG TMC ZU HEISS" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2306,121 +2300,125 @@ msgstr "" "Stealth Modus" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Warte auf Benutzer.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekühlt ist" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekühlt sind" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Warnen" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geändert." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geändert." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geändert." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Verdrahtungsfehler" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Assistent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-Korrektur:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schräglauf wird automatisch korrigiert." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" -msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" +msgstr "" +"XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." -msgstr "XYZ-Kalibrierung beeinträchtigt. Vordere Kal.-Punkte nicht erreichbar." +msgstr "" +"XYZ-Kalibrierung beeinträchtigt. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 -msgid "XYZ calibration compromised. Right front calibration point not reachable." +#: ../../Firmware/ultralcd.cpp:3220 +msgid "" +"XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kal.-Punkte nicht erreichbar." +msgstr "" +"XYZ-Kalibrierung fehlgeschlagen. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen - mehr im Handbuch." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung fehlgeschlagen. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glückwunsch!" +msgstr "" +"XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glückwunsch!" #. MSG_Y_DIST_FROM_MIN c=20 #: ../../Firmware/ultralcd.cpp:2485 @@ -2428,35 +2426,36 @@ msgid "Y distance from min" msgstr "Y Entfernung vom Min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-Korrektur:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" -"Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu starten." +"Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu " +"starten." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-Korrektur:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-Test Nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -2466,41 +2465,135 @@ msgid "and press the knob" msgstr "und Knopf drücken" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "um Filament laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "um Filament entladen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "unbekannt" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "Status unbekannt" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Aktualisiere" -#~ msgid "Autoloading filament available only when filament sensor is turned on..." +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU Netzfehler" + +#. MSG_EJECT_FROM_MMU c=16 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +msgid "Eject from MMU" +msgstr "" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Eject filament" +#~ msgstr "Filamentauswurf" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Wähle extruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfügbar..." +#~ "MMU meldet Inkompatibilität FW. Stell sicher, dass MMU-FW aktuell ist." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Unerwarteter FINDA-Wert. Stellen Sie sicher, dass sich kein Filament unter " +#~ "FINDA befindet und der Selektor frei ist. Prüfen Sie die FINDA-Verbindung." + +#~ msgid "" +#~ "Autoloading filament available only when filament sensor is turned on..." +#~ msgstr "" +#~ "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor " +#~ "verfügbar..." #~ msgid "Crash detected. Resume print?" #~ msgstr "Crash erkannt. Druck fortführen?" @@ -2550,9 +2643,6 @@ msgstr "🔃Aktualisiere" #~ msgid "MMU needs user attention." #~ msgstr "MMU erfordert Benutzereingriff." -#~ msgid "MMU power fails" -#~ msgstr "MMU Netzfehler" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Bitte Filament entfernen und dann den Knopf drücken" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 07d8f771c..6ad97e8fc 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 o mayor" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s nivel esperado" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Cancelar" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Ajustar-Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Todo bien" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Terminado. Felices impresiones!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Siemp." #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Llevar al origen" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Encendido" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Carga auto. filam." @@ -116,53 +115,53 @@ msgid "Avoiding grind" msgstr "Evitar morder" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Eje" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Longitud del eje" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Atras" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Base" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Calentando Base" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Base preparada" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Corr. de la cama" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,55 +169,55 @@ msgstr "" "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Base/Calentador" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Estado de correa" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test cinturon" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. Re- anudar la impresion?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Brillo" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "ERROR COMUNICACION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Calibrar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +226,13 @@ msgstr "" "superiores. Despues haz clic." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,45 +241,46 @@ msgstr "" "superiores. Despues haz clic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Calibrar pos.inicial" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Calibracion" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Calibracion OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "No se puede mover Selector o Tensor." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "No se puede realizar la acción, filamento ya cargado. Descárgalo primero." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Tarjeta retirada" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Cambiar Tarj. SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Cambiar filamento" @@ -295,55 +295,55 @@ msgid "Changed correctly?" msgstr "Cambio correcto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Control sensor X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Control sensor Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Control sensor Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Control base cal." #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Control endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Verif. archivo" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Control fusor" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Comprobando sensores" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Comprobaciones" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Borrar error TM" @@ -353,12 +353,12 @@ msgid "Color not correct" msgstr "Color no homogeneo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Desde la comunidad" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Cont." @@ -368,31 +368,31 @@ msgid "Cooldown" msgstr "Enfriar" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Choque" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Det. choque" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Choque detectado." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,34 +403,34 @@ msgstr "" "Modo normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Cortar filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Cuchillo" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Fecha:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Oscuro" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Desactiva" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Apagar motores" @@ -442,18 +442,18 @@ msgid "Disengaging idler" msgstr "Soltando tensor" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Distancia entre la punta del boquilla y la superficie de la base aun no " "fijada. Siga el manual, capitulo Primeros Pasos." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -461,12 +461,12 @@ msgstr "" "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Listo" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Corregir-E:" @@ -500,8 +500,8 @@ msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Expulsar de MMU" @@ -513,17 +513,17 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Final de carrera" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Endstop no alcanzado" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Finales de carrera" @@ -535,47 +535,45 @@ msgid "Engaging idler" msgstr "Enganchando tensor" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruir" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Info. del extrusor" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "Autocarg.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Det. atasco f" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "Fin fil." #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FIL. YA CARGADO" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NO SE ACTIVO" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -584,7 +582,7 @@ msgstr "" "manualmente. Comprueba que el fi-lamento puede mover-se y FINDA funciona." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -593,67 +591,67 @@ msgstr "" "puede moverse y FINDA funciona." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ATASCO FIL." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS accion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NO SE ACTIVO" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR MUY PRONTO" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: ATASCO FIL." #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "ERROR EJECUCION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Estadistica Fallos" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Total Fallos MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falsa activacion" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Velocidad Vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventiladores" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Comprob.vent" @@ -682,22 +680,23 @@ msgid "Feeding to nozzle" msgstr "Aliment. a la boq." #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. acabado" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Sensor Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filamento" @@ -713,14 +712,14 @@ msgid "Filament not loaded" msgstr "Fil. no introducido" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Sensor de fil." #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -729,23 +728,23 @@ msgstr "" "Asegúrate de que el filamento puede moverse y el sensor funciona." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" -"El sensor de filamento no se activó al cargar el filamento. Asegúrate de que " -"el filamento llegó al sensor y que éste funciona." +"El sensor de filamento no se activó al cargar el filamento. Asegúrate de que" +" el filamento llegó al sensor y que éste funciona." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" "El sensor de filamento se activó demasiado pronto al cargar el extrusor. " -"Comprueba que no ha-ya nada atascado en el tubo de teflón y que el sensor va " -"ok." +"Comprueba que no ha-ya nada atascado en el tubo de teflón y que el sensor va" +" ok." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -753,36 +752,37 @@ msgid "Filament used" msgstr "Filamento usado" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. Continuar de todos modos?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Term. movimientos" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Cal. primera cap." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Primero, hare el Selftest para comprobar los problemas de montaje mas " "comunes." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flujo" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,28 +791,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Vent. frontal?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Frontal [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Vents. front/izqui" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "Codigo G laminado para un nivel diferente. Continuar?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -821,28 +821,28 @@ msgstr "" "Impresion cancelada." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "Codigo G laminado para un tipo de impresora dif.Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" -"Codigo G laminado para una impresora diferente. Relamina el modelo de nuevo. " -"Impresion cancelada." +"Codigo G laminado para una impresora diferente. Relamina el modelo de nuevo." +" Impresion cancelada." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "Codigo G laminado para nuevo firmware. Continuar?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -851,35 +851,35 @@ msgstr "" "cancelada." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "Configuracion HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Calentando..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Calentando acabado." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -890,18 +890,18 @@ msgstr "" "listo para imprimir." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" -"Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la " -"configuracion?" +"Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la" +" configuracion?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Rend.pleno" @@ -912,48 +912,48 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Fusor a 280C! Boquilla cambiado y ajust. a la medida?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Vent. d. fusor:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Hare la calibracion XYZ. Puede tardar hasta 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "TENSOR: ERROR HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "TENSOR: ERROR MOV." -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "HERR. INVALIDA" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -962,17 +962,17 @@ msgstr "" "Ajustes HW - Planchas acero." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Mejorando punto calibracion base" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Monitorizar" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. Tarjeta SD" @@ -982,7 +982,7 @@ msgid "Insert filament" msgstr "Introducir filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -990,40 +990,41 @@ msgstr "" "Inserta el filamento (no lo cargue) en el extrusor y luego presiona el dial." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Error interno de ejecucion. Intenta reiniciar la MMU o actualizar el " -"firmware. Si el problema persiste, ponte en contacto con el servicio tecnico." +"firmware. Si el problema persiste, ponte en contacto con el servicio " +"tecnico." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Esta c. la lamina sobre la base?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteracion" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Ultima impresion" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Ultimos imp. fallos" @@ -1033,57 +1034,57 @@ msgid "Left" msgstr "Izquierda" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Izquierda [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Valor brill." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Valor oscuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Correc. Linealidad" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Micropaso Eje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Intr. todos fil." #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Introducir filam." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Cargar a boquilla" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1093,69 +1094,70 @@ msgid "Loading color" msgstr "Cambiando color" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Introduciendo filam." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Polea suelta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Alto" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "ACT. FW MMU PRECISA" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Error interno del firmware MMU, reinicia el MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "Modo MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NO RESPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Reintento: Restaurando temperatura..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST FALLO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Fallos MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Carga MMU falla" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1164,7 +1166,7 @@ msgstr "" "Si el problema persiste, contacta con el servicio técnico." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1173,23 +1175,23 @@ msgstr "" "persiste, ponte en contacto con el servicio tecnico." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 conectado" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Comp. imanes" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Menu principal" @@ -1199,83 +1201,84 @@ msgid "Measured skew" msgstr "Desv. medida" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Malla" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Nivela. Malla Base" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Modo" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Cambio de modo progresando ..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modelo" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Mas detalles online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Mover X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Mover Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Mover Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Mover ejes" @@ -1286,96 +1289,98 @@ msgid "Moving selector" msgstr "Moviendo selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "No hay tarjeta SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Sin movimiento" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Ninguno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "No hay conexion" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Ventilador no gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" -"Voy a calibrar la distancia entre la punta de la boquilla y la superficie de " -"la base." +"Voy a calibrar la distancia entre la punta de la boquilla y la superficie de" +" la base." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Boquilla" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Cambio de boquilla" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "D boquilla" @@ -1386,84 +1391,84 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Ina" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del " "extrusor, etc" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Act" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Una vez" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERROR TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "Cal. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "Cal. PID terminada" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "Calibracion PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Calentando PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Fallo de la calibracion de PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1472,7 +1477,7 @@ msgstr "" "menu Configuracion -> Cal. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "POLEA: ERROR MOV." @@ -1483,13 +1488,13 @@ msgid "Parking selector" msgstr "Aparcando selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pausar impresion" @@ -1500,7 +1505,7 @@ msgid "Performing cut" msgstr "Realizando corte" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1510,7 +1515,7 @@ msgstr "" "impresora inmediatamente." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1519,34 +1524,34 @@ msgstr "" "continua con el Asistente" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Comprueba la conexion del IR sensor y filamento esta descargado." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Controla:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, y luego presiona el dial." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Clic cuando acabes." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Coloca el filamento en el extrusor, luego presiona el dial para cargarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1555,73 +1560,73 @@ msgstr "" "cargarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Carga primero el filamento." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Abre el tensor y retira el filamento manualmente." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Coloca la lam. de acero en la base calefactable." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Pulsa el dial para descargar el filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Retira el filamento de inmediato" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Retira los soportes de envio primero." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Retira la lam. de acero de la base calefactable." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Realiza la calibracion XYZ primero." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descarga el filamento, luego repite esta accion." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Actualiza por favor." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Por favor espere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Fallos energia" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Precalentar" @@ -1631,28 +1636,28 @@ msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Precalent. laminar" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Precalent. expulsar" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Precalent. cargar" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Precalent. descargar" @@ -1663,33 +1668,33 @@ msgid "Preparing blade" msgstr "Preparando cuchilla" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Pulsa el dial" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Impresion cancelada" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Vent.fusor:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Menu tarjeta SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Impresion en pausa" @@ -1699,39 +1704,39 @@ msgid "Print time" msgstr "Tiempo de imp." #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Dir. IP impresora:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Impresora no esta calibrada todavia. Usa el manual capitulo Primeros pasos " "Calibracion flujo." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro nozzle impresora difiere de cod.G. Continuar?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en " "ajustes. Impresion cancelada." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" -"El motor de la polea se ha parado. Asegúrate de que la polea puede moverse y " -"comprueba el cableado." +"El motor de la polea se ha parado. Asegúrate de que la polea puede moverse y" +" comprueba el cableado." #. MSG_PROGRESS_PUSH_FILAMENT c=20 #: ../../Firmware/mmu2_progress_converter.cpp:23 @@ -1740,71 +1745,66 @@ msgid "Pushing filament" msgstr "Empujando filamento" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "COLA LLENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "Puerto RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Trasera [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Recuper. impresion" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Retira el filamento viejo y presione el dial para comenzar a cargar el nuevo " -"filamento." +"Retira el filamento viejo y presione el dial para comenzar a cargar el nuevo" +" filamento." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Renombrar" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" "El filamento solicitado no está disponible en este hardware. Revise el " -"código G para verificar si el índice de herramienta está fuera de rango (T0-" -"T4)." +"código G para verificar si el índice de herramienta está fuera de rango " +"(T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Reanudar impres." #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Continuan. impresion" @@ -1815,7 +1815,7 @@ msgid "Retract from FINDA" msgstr "Retraer del FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Reint" @@ -1831,12 +1831,12 @@ msgid "Right" msgstr "Derecha" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Derecha [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1845,73 +1845,68 @@ msgstr "" "comenzara de nuevo. Continuar?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "Tarj. SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELECT. SIN HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELECT. SIN MOVERSE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "PARADA" #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Seleccionar" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" -"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en " -"el menu en pantalla." - -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Elegir extrusor:" +"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en" +" el menu en pantalla." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Selecciona filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Cambiar el idioma" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu " "material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." @@ -1922,58 +1917,58 @@ msgid "Selecting fil. slot" msgstr "Eligiendo hueco fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Self test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Iniciar Selftest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Error Selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Fallo Selftest" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Se realizara el auto-test para calibrar con precision la vuelta a la " "posicion inicial sin sensores." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info sensor" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retira el filamento ahora." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Establecer temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Configuracion" @@ -1983,13 +1978,13 @@ msgid "Severe skew" msgstr "Desv. severa" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Lamina" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -2002,13 +1997,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Mostrar endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Acallar" @@ -2018,7 +2013,7 @@ msgid "Slight skew" msgstr "Desv. ligera" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2027,128 +2022,127 @@ msgstr "" "ordenar." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Ordenar" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Ordenando archivos" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Sonido" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Velocidad" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Ventilador girando" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Estadisticas" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Sigilo" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Lamina de acero" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Parar" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Detener impresion" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Estrict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Soporte" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Intercambiado" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "ERROR DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "RESET DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "CORTO DRIVER TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "ERROR SOBRECAL TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERROR SBRVOLTAJE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2157,45 +2151,35 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Modelo térmico todavia sin cal." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturas" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Probando filamento" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "El tensor no hacer home correctamente. Comprueba si hay algo que bloquea su " "movimiento." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"La MMU informa que su FW no es compatible con el de la impresora. Asegurate " -"de que el FW esta actualizado." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2203,7 +2187,7 @@ msgstr "" "su movimiento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2214,7 +2198,7 @@ msgstr "" "de calibracion)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2223,24 +2207,24 @@ msgstr "" "Primeros pasos." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Fecha" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Expirar" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Fallos totales" @@ -2255,39 +2239,30 @@ msgid "Total print time" msgstr "Tiempo total imp." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Ajustar" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "DESCARGA MANUAL" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Lectura inesperada de FINDA. Asegurate de que no hay ningun filamento bajo " -"FINDA y que el selector esta libre. Compruebe la conexion del FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Desc." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Descargar fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Descargando fil." @@ -2304,23 +2279,23 @@ msgid "Unloading to pulley" msgstr "Descarga hasta polea" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retira el filamento e intenta nuevamente." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Voltajes" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "AVISO TMC DEM. CALOR" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2333,122 +2308,121 @@ msgstr "" "Modo silencio" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Esperando ordenes..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Aviso" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "" "Aviso: tanto el tipo de impresora como el tipo de la placa han cambiado." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Aviso: el tipo de placa ha cambiado." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Aviso: ha cambiado el tipo de impresora." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Se descargo con exito el filamento?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Error de conexion" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Asistente" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Corregir-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La desviacion se corregira automaticamente." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibracion XYZ correcta. Los ejes X/Y estan ligeramente desviados. Buen " "trabajo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" @@ -2458,34 +2432,34 @@ msgid "Y distance from min" msgstr "Dist. en Y desde min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Corregir-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Asistente" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Corregir-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -2495,43 +2469,126 @@ msgid "and press the knob" msgstr "y presione el dial" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "para cargar el fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "para descargar fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "desconocido" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "estado desconocido" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Actualizar" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Fallo red MMU" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Elegir extrusor:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "La MMU informa que su FW no es compatible con el de la impresora. Asegurate " +#~ "de que el FW esta actualizado." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Lectura inesperada de FINDA. Asegurate de que no hay ningun filamento bajo " +#~ "FINDA y que el selector esta libre. Compruebe la conexion del FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" -#~ "La carga automatica solo funciona si el sensor de filamento esta " -#~ "activado..." +#~ "La carga automatica solo funciona si el sensor de filamento esta activado..." #~ msgid "Crash detected. Resume print?" #~ msgstr "Choque detectado. Continuar impresion?" @@ -2541,8 +2598,7 @@ msgstr "🔃Actualizar" #~ msgid "ERROR: Filament sensor is not responding, please check connection." #~ msgstr "" -#~ "ERROR:Sensor de fi- lamento no responde Por favor, comprue- ba la " -#~ "conexion." +#~ "ERROR:Sensor de fi- lamento no responde Por favor, comprue- ba la conexion." #~ msgid "FS v0.3 or older" #~ msgstr "FS 0.3 o mayor" @@ -2583,9 +2639,6 @@ msgstr "🔃Actualizar" #~ msgid "MMU needs user attention." #~ msgstr "MMU necesita atencion del usuario." -#~ msgid "MMU power fails" -#~ msgstr "Fallo red MMU" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Por favor quite el filamento y luego presione el dial." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 05bce27eb..9f4b82bee 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -16,89 +16,88 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 -#: ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 -#: ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "niveau %s attendu" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Annuler" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Ajuster Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Tout est correct" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne impression!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Tjrs" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Ambiant" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Mise a 0 des axes" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Puiss.auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autocharge du fil." @@ -116,53 +115,53 @@ msgid "Avoiding grind" msgstr "Eviter broiement" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Axe" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Longueur de l'axe" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Retour" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Plateau" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Chauffe du plateau" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Plateau termine" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Reglage plateau" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -171,118 +170,119 @@ msgstr "" "attente d'un reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Plateau/Chauffage" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Statut courroie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test de courroie" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impres.?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Luminosite" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "ERREUR COMMUNICATION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Calibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe " -"Z jusqu'aux butees. Cliquez une fois fait." +"Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans " +"l'axe Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Calibration Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " -"Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end " +"stoppers. Click when done." msgstr "" -"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z " -"jusqu'aux butees. Cliquez une fois fait." +"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe" +" Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Calib. mise a 0" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Calibration" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Calibration terminee" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Impossible de deplacer le Selecteur ou l'Idler." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Impossible d'effectuer l'action, le filament est deja charge. Dechargez-le " "d'abord." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Carte retiree" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Changez carte SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Changer filament" @@ -297,55 +297,55 @@ msgid "Changed correctly?" msgstr "Change correctement?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Verific. axe X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Verific. axe Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Verific. axe Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Verif. plateau" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Verific. butees" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Verific. fichier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Verif. du hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Verif. des capteurs" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Verifications" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Effacer l'error TM" @@ -355,12 +355,12 @@ msgid "Color not correct" msgstr "Couleur incorrecte" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Fait de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Cont." @@ -370,31 +370,31 @@ msgid "Cooldown" msgstr "Refroidissement" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Copier la langue choisie?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Detect.crash" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash detecte." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,34 +406,34 @@ msgstr "" "mode Normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Coupe filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Coupeur" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Date:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Sombre" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -445,17 +445,18 @@ msgid "Disengaging idler" msgstr "Desenga.t de l'idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer calibration." +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " +"calibration." msgstr "" -"La distance entre de la buse et du plateau n'a pas encore ete reglee. Suivez " -"le manuel, chap. Premiers pas." +"La distance entre de la buse et du plateau n'a pas encore ete reglee. Suivez" +" le manuel, chap. Premiers pas." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -464,12 +465,12 @@ msgstr "" "plateau?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Fait" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Correct-E:" @@ -503,8 +504,8 @@ msgid "ERROR:" msgstr "ERREUR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Éjecter du MMU" @@ -516,17 +517,17 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Butee" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Butee non atteinte" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Butees" @@ -538,125 +539,124 @@ msgid "Engaging idler" msgstr "Engagem.t de l'idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extrudeur" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Infos extrudeur" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autocharg." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Detect bour F" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "Fin de F." #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT DEJA CHARGE" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NON DECLENCHEE" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA non desactivee lors du dechargement du filament. Essayez de decharger a " -"la main. Assurez-vous que le filament peut bouger et que la FINDA fonctionne." +"FINDA non desactivee lors du dechargement du filament. Essayez de decharger " +"a la main. Assurez-vous que le filament peut bouger et que la FINDA " +"fonctionne." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can move " -"and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can " +"move and FINDA works." msgstr "" -"La FINDA ne s'est pas declenchee lors du chargement du filament. Assurez-vous " -"que le filament peut bouger et que la FINDA fonctionne." +"La FINDA ne s'est pas declenchee lors du chargement du filament. Assurez-" +"vous que le filament peut bouger et que la FINDA fonctionne." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOQUE" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "Action FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "CAPTEUR F. NON DECL." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "CAPTEUR F TROP TOT" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "CAPTEUR F: F. BLOQUE" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "ERREUR EXECUTION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Stat. d'echec" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Faux declenchement" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Vitesse vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test du ventilateur" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Verif vent." @@ -685,22 +685,23 @@ msgid "Feeding to nozzle" msgstr "Chargement vers buse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fins filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Capteur Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -716,38 +717,38 @@ msgid "Filament not loaded" msgstr "Filament non charge" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Capteur Fil." #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Capteur de f. non desactive lors du dechargement du filament. Assurez-vous que " -"le filament peut bouger et que le capteur fonctionne." +"Capteur de f. non desactive lors du dechargement du filament. Assurez-vous " +"que le filament peut bouger et que le capteur fonctionne." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the filament " -"reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the " +"filament reached the fsensor and the sensor works." msgstr "" -"Capteur de f. non declenche lors du chargement du filament. Assurez-vous que " -"le filament a atteint le capteur f et que le capteur fonctionne." +"Capteur de f. non declenche lors du chargement du filament. Assurez-vous que" +" le filament a atteint le capteur f et que le capteur fonctionne." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Capteur de f. declenche trop tot lors du chargement dans l'extrudeur. Verifiez " -"le tube PTFE. Verifiez que le capteur fonctionne." +"Capteur de f. declenche trop tot lors du chargement dans l'extrudeur. " +"Verifiez le tube PTFE. Verifiez que le capteur fonctionne." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -755,36 +756,37 @@ msgid "Filament used" msgstr "Filament utilise" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Mouvement final" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Cal. 1ere couche" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" -"Je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus " -"communs." +"Je vais lancer le Auto-test pour verifier les problemes d'assemblage les " +"plus communs." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flux" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -793,58 +795,58 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Ventilo impr avant?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Avant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Ventilos avt/gauche" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "Le G-code a ete prepare pour un niveau different. Continuer?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"G-code a ete prepare pour un niveau different. Decouper le modele a nouveau. " -"Impression annulée." +"G-code a ete prepare pour un niveau different. Decouper le modele a nouveau." +" Impression annulée." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code a ete prepare pour un type d'im- primante dif. Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code pour un type d'imprimante différent. Decouper le modele a nouveau. " "Impression annulée." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code a ete prepare pour une FW version plus recente. Cont.?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -853,57 +855,57 @@ msgstr "" "annulee." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "Config HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Chauffe" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Chauffe terminee." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " -"setup process, in which the Z-axis will be calibrated. Then, you will be ready " -"to print." +"setup process, in which the Z-axis will be calibrated. Then, you will be " +"ready to print." msgstr "" "Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous guider au " "cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. " "Apres cela, tout sera pret pour imprimer." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" -"Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous " -"guide dans le processus d'installation?" +"Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous" +" guide dans le processus d'installation?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Haut.puiss" @@ -914,68 +916,69 @@ msgid "Homing" msgstr "Mise a zero" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "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:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" -"Je vais maintenant lancer la calibration XYZ. Cela peut prendre jusqu'à 24 min." +"Je vais maintenant lancer la calibration XYZ. Cela peut prendre jusqu'à 24 " +"min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "RAZ IDLER IMPOSSIBLE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "ECHEC MOUV.T IDLER" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "OUTIL INVALIDE" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - HW " -"Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - " +"HW Setup - Steel sheets." msgstr "" "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans " "Reglages - Config HW - Plaque en acier." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Amelioration du point de calibration du plateau" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Ecran d'info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. carte SD" @@ -985,48 +988,49 @@ msgid "Insert filament" msgstr "Inserez le filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" -"Insert the filament (do not load it) into the extruder and then press the knob." +"Insert the filament (do not load it) into the extruder and then press the " +"knob." msgstr "" "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis " "appuyez sur le bouton." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" -"Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour " -"le FW. Si le probleme persiste, contactez le support." +"Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour" +" le FW. Si le probleme persiste, contactez le support." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Est la plaque sur le plateau?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Derniere impres." #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Echecs derniere imp." @@ -1036,57 +1040,57 @@ msgid "Left" msgstr "Gauche" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Ventilo gauche?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Gauche [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Niveau brill" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Niv. sombre" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Correction lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Ajuster Z en dir." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Tout Charger" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Charger filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Charger la buse" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1096,78 +1100,79 @@ msgid "Loading color" msgstr "Charg. de la couleur" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/mmu2_progress_converter.cpp:51 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Chargement du fil." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Poulie lache" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Fort" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MAJ FW MMU NECESS." #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Erreur interne du FW du MMU, reinitialiser le MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "Mode MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "LE MMU NE REPOND PAS" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "Nouvelle tentative MMU: Restauration de la temperature..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTO-TEST ECHEC" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Echecs MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Def. charg. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU ne repond pas correctement. Verifiez le cablage et les connecteurs. Si le " -"probleme persiste, contactez le support." +"MMU ne repond pas correctement. Verifiez le cablage et les connecteurs. Si " +"le probleme persiste, contactez le support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1176,23 +1181,23 @@ msgstr "" "persiste, contactez le support." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 connecte" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Compens. aim." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Menu principal" @@ -1202,83 +1207,84 @@ msgid "Measured skew" msgstr "Var. mesuree" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Changement de mode en cours..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modele" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Plus de details en ligne." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Moteur" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Deplacer X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Deplacer Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Deplacer Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Deplacer l'axe" @@ -1289,65 +1295,64 @@ msgid "Moving selector" msgstr "Deplacement select." #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "I/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Nouvelle version de FW disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Non" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Pas de carte SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Pas de mouvement." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Aucun" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Non connecte" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Ne tourne pas" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1355,30 +1360,33 @@ msgstr "" "plateau." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Buse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Changement de buse" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Diam. buse" @@ -1389,92 +1397,92 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "1 fois" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE ERREUR THERM." #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "Calib. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "Calib. PID terminee" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "Calibration PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Echec de la calibration en PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu Settings-" -">PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu " +"Settings->PINDA cal." msgstr "" -"La calibration en PINDA est terminee et activee. Il peut etre desactivee dans " -"le menu Reglages-> Calib. PINDA" +"La calibration en PINDA est terminee et activee. Il peut etre desactivee " +"dans le menu Reglages-> Calib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "ECHEC MOUV.T POULIE" @@ -1485,13 +1493,13 @@ msgid "Parking selector" msgstr "Parquage selecteur" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pause de l'impr." @@ -1502,7 +1510,7 @@ msgid "Performing cut" msgstr "Coupe en cours" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1511,7 +1519,7 @@ msgstr "" "premiers points. Si la buse accroche le papier, eteignez vite l'imprimante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1520,109 +1528,110 @@ msgstr "" "l'assistant en redemarrant l'imprimante." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Verifiez:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez la plaque en acier et appuyez sur le bouton." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 -msgid "Please insert filament into the extruder, then press the knob to load it." +#: ../../Firmware/ultralcd.cpp:3795 +msgid "" +"Please insert filament into the extruder, then press the knob to load it." msgstr "" -"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour " -"le charger." +"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton " +"pour le charger." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob to " -"load it." +"Please insert filament into the first tube of the MMU, then press the knob " +"to load it." msgstr "" "Inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton " "pour le charger." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Mettez a jour le FW." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Merci de patienter" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Coup.de courant" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Prechauffage" @@ -1632,28 +1641,28 @@ msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Chauffe pour couper" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Chauf. pour remonter" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Chauffe pour charger" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Chauf.pour decharger" @@ -1664,33 +1673,33 @@ msgid "Preparing blade" msgstr "Preparation lame" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "App. sur sur bouton" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Impression annulee" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Vent. impr:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Impr. depuis la SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Impression en pause" @@ -1700,38 +1709,39 @@ msgid "Print time" msgstr "Temps d'impression" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Adr.IP imprimante:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" -"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers " -"pas - Processus de calibration." +"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre " +"Premiers pas - Processus de calibration." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diamètre de la buse diffère du G-Code. Continuer?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" -"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression annulee." +"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression " +"annulee." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" -"Le moteur de la poulie s'est bloque. Assurez-vous que la poulie peut bouger et " -"verifiez le cablage." +"Le moteur de la poulie s'est bloque. Assurez-vous que la poulie peut bouger " +"et verifiez le cablage." #. MSG_PROGRESS_PUSH_FILAMENT c=20 #: ../../Firmware/mmu2_progress_converter.cpp:23 @@ -1740,69 +1750,65 @@ msgid "Pushing filament" msgstr "Chargement filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "FILE PLEINE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Arriere [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Recup. impression" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau." +"Retirez l'ancien filament puis appuyez sur le bouton pour charger le " +"nouveau." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Renommer" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"L'outil de filament demande n'est pas disponible sur ce materiau. Recherchez " -"dans le G-code un index d'outil hors plage (T0-T4)." +"L'outil de filament demande n'est pas disponible sur ce materiau. Recherchez" +" dans le G-code un index d'outil hors plage (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reinitialiser" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reini MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Reprise impression" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Reprise de l'impr." @@ -1813,7 +1819,7 @@ msgid "Retract from FINDA" msgstr "Rétraction de FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Ref." @@ -1829,12 +1835,12 @@ msgid "Right" msgstr "Droite" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Droite [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1843,39 +1849,39 @@ msgstr "" "commencera du debut. Continuer?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "Carte SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "ECHEC RAZ SELECTEUR" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "ECHEC MOUV.T SELECT." #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ARRETE." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Recherche point calibration du plateau" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Selectionner" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1883,33 +1889,28 @@ msgstr "" "Choisissez un filament pour la Calibration de la Premiere Couche et " "selectionnez-le dans le menu." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Choisir extrudeur:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Choix du filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Choisir langue" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" -"Selectionnez la temperature de prechauffage de la buse qui correspond a votre " -"materiau." +"Selectionnez la temperature de prechauffage de la buse qui correspond a " +"votre materiau." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." @@ -1920,57 +1921,57 @@ msgid "Selecting fil. slot" msgstr "Sélection du fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Auto-test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Debut auto-test" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Auto-test" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Erreur auto-test!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Echec de l'auto-test" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info capteur" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Regler temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Reglages" @@ -1980,13 +1981,13 @@ msgid "Severe skew" msgstr "Deviat.sev." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Plaque" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1999,13 +2000,13 @@ msgstr "" "%cReinitialiser" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Afficher butees" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Furtif" @@ -2015,7 +2016,7 @@ msgid "Slight skew" msgstr "Deviat.leg." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2023,128 +2024,127 @@ msgstr "" "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Tri" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Tri des fichiers" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Son" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Vitesse" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Tourne" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Une temperature ambiante stable de 21-26C et un support stable sont requis." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistiques" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Furtif" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Plaques en acier" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Arreter impression" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Stricte" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Echange" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "ANOMALIE THERMIQUE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "ERREUR DU DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "REINIT DU DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "CC DU DRIVER TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "ERR SURCHAUFFE TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR SOUS TENSION TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2153,52 +2153,43 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Modele de thermique non calibre." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperature" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperatures" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Test du filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "The Idler cannot home properly. Check for anything blocking its movement." -msgstr "" -"L'Idler ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi que " -"ce soit qui bloque son mouvement." - -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" -"The MMU unit reports its FW version incompatible with the printer's firmware. " -"Make sure the MMU firmware is up to date." +"The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -"MMU signale que sa version de FW est incompatible avec le FW de l'imprimante. " -"Assurez-vous que le FW du MMU est à jour." +"L'Idler ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi " +"que ce soit qui bloque son mouvement." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" -"Le selecteur ne peut pas se mettre correctement a zero. Verifiez s'il y a quoi " -"que ce soit qui bloque son mouvement." +"Le selecteur ne peut pas se mettre correctement a zero. Verifiez s'il y a " +"quoi que ce soit qui bloque son mouvement." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2208,33 +2199,33 @@ msgstr "" "jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, chapter " -"First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, " +"chapter First steps, section Calibration flow." msgstr "" "Il faut toujours effectuer la Calibration Z. Suivre le manuel, chapitre " "Premiers pas - Processus de calibration." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Heure" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Delai ecoule" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Total des echecs" @@ -2249,38 +2240,30 @@ msgid "Total print time" msgstr "Temps total impr." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Regler" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "DECHARGER MANUEL.T" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Valeur de FINDA inattendue. Vérifiez qu'il n'y a pas de filament sous la " -"FINDA, que le selecteur est libre, et la connexion de la FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Dech." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Decharger fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/mmu2_progress_converter.cpp:50 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Dechargement fil." @@ -2297,23 +2280,23 @@ msgid "Unloading to pulley" msgstr "Dechar.t vers poulie" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Tensions" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "ATT TMC TROP CHAUD" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2326,130 +2309,132 @@ msgstr "" "mode furtif" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Attente utilisateur." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Avert" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Attention: Types d'imprimante et de carte mere modifies" #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Attention: Type de carte mere modifie." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Erreur de cablage" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Assistant" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Correct-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "Init XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Details calib. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibration XYZ OK. L'ecart sera corrige automatiquement." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon " "boulot!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Calibration XYZ compromise. Les points de calibration en avant ne sont pas " "atteignables." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 -msgid "XYZ calibration compromised. Right front calibration point not reachable." +#: ../../Firmware/ultralcd.cpp:3220 +msgid "" +"XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Calibration XYZ compromise. Le point de calibration avant droit n'est pas " "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" -"Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." +"Echec calibration XYZ. Le point de calibration du plateau n'a pas ete " +"trouve." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Echec calibration XYZ. Les points de calibration en avant ne sont pas " "atteignables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Echec calibration XYZ. Le point de calibration avant droit n'est pas " "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" +msgstr "" +"Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" #. MSG_Y_DIST_FROM_MIN c=20 #: ../../Firmware/ultralcd.cpp:2485 @@ -2457,34 +2442,35 @@ msgid "Y distance from min" msgstr "Distance Y du min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Correct-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Oui" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." +msgstr "" +"Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Correct-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Mesurer x-fois" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -2494,38 +2480,122 @@ msgid "and press the knob" msgstr "et appuyez sur le bouton" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "pour charger le fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "pour decharger fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "inconnu" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "Etat inconnu" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Rafraichir" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Def. alim. MMU" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reini MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Choisir extrudeur:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU signale que sa version de FW est incompatible avec le FW de " +#~ "l'imprimante. Assurez-vous que le FW du MMU est à jour." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Valeur de FINDA inattendue. Vérifiez qu'il n'y a pas de filament sous la " +#~ "FINDA, que le selecteur est libre, et la connexion de la FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2580,9 +2650,6 @@ msgstr "🔃Rafraichir" #~ msgid "MMU needs user attention." #~ msgstr "Le MMU necessite l'attention de l'utilisateur." -#~ msgid "MMU power fails" -#~ msgstr "Def. alim. MMU" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Veuillez retirer le filament puis appuyez sur le bouton." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 4b5897e1d..66f7aecb4 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 ili stariji" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 ili noviji" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s level ocekivan" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Otkazati" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Podesavanje Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Sve je u redu" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Sve je gotovo. Sretno printanje!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Uvijek" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Ambijent" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Jesu lijevi i desni Z~nosaci podignuti?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Pomoc" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Pocetna tocka" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Auto napaj" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autopunj filamenta" @@ -115,53 +114,53 @@ msgid "Avoiding grind" msgstr "Sprecavanje mljevenj" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Duljina osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Natrag" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Podloga" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Podloga se zagrijava" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Podloga zagrijana" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Podloga ispravna" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,55 +169,55 @@ msgstr "" "mlaznici? Ceka se resetiranje." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Grijac/Podloga" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Status remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Testiranje remena" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Doslo je do gasenja. Oporaviti print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Svijet" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Svjetlina" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "KOM. GRESKA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibrirajte XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrirajte Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +226,13 @@ msgstr "" "Kliknite kada je zavrseno." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibriracija Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,45 +241,46 @@ msgstr "" "Kliknite kada je zavrseno." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibracija nultocke" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibriranje" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibracija gotova" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Ne mogu pomaknuti Odabirac ili Klizac." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Nije moguce izvrsiti radnju, filament je već napunjen. Prvo ga isprazni." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Kartica je uklonjena" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Promjeni SD karti." #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Promijeni filament" @@ -295,55 +295,55 @@ msgid "Changed correctly?" msgstr "Ispravno izmjenjeno?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Provjera X osi" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Provjera Y osi" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Provjera Z osi" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Provjera podloge" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Provjera granicnika" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Provjera datoteke" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Provjera hotenda" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Provjera senzora" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Provjere" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Obriši TM pogrešku" @@ -353,12 +353,12 @@ msgid "Color not correct" msgstr "Boja nije ispravna" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Napravilo zajedno" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Nast." @@ -368,31 +368,31 @@ msgid "Cooldown" msgstr "Ohladi" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kopirati odabrani jezik?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Udar" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Udar detekti." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Udar otkriven." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -400,34 +400,34 @@ msgid "" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Odrezite fil." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Rezac" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Tamno" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Onemoguci" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Onemoguci stepere" @@ -439,11 +439,11 @@ msgid "Disengaging idler" msgstr "Iskl. kliznika" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Udaljenost izmedu vrha mlaznice i povrsine lezista jos nije postavljena. " @@ -451,7 +451,7 @@ msgstr "" "prvog sloja." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -460,12 +460,12 @@ msgstr "" "mlaznice i grijace podloge?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Gotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-ispravan:" @@ -499,8 +499,8 @@ msgid "ERROR:" msgstr "POGRESKA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Izbaci iz MMU" @@ -512,17 +512,17 @@ msgid "Ejecting filament" msgstr "Izbacivanje fil." #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Granicnik" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Granicnik nije aktiv" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Granicnici" @@ -534,47 +534,45 @@ msgid "Engaging idler" msgstr "Angaziranje klizaca" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Info o ekstruderu" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. auto.punj" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F. zastopan" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. isteko" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT VEC NAPUNJ." #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA SE NIJE AKT." #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -583,7 +581,7 @@ msgstr "" "ručno. Provjerite može li se filament pomicati i FINDA radi." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -592,67 +590,67 @@ msgstr "" "filament pomicati i FINDA radi." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. ZAPEO" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS Akcija" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENZOR NIJE AKTIV." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENZOR PRERANO" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENZOR FIL. ZAPEO" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW GRESKA IZVRSENJA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Neuspjesna stat" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Neuspjes. MMU stat" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Lazno aktiviranje" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Brzina vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Provjera vent" @@ -681,22 +679,23 @@ msgid "Feeding to nozzle" msgstr "Dovod do mlaznice" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Bez filmaneta" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -712,38 +711,38 @@ msgid "Filament not loaded" msgstr "Fil. nije napunjen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Senzor filamenta" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Senzor filamenta nije se isključio tijekom vadjenja filamenta. Osigurajte da " -"se filament moze pomaknuti i da senzor radi" +"Senzor filamenta nije se isključio tijekom vadjenja filamenta. Osigurajte da" +" se filament moze pomaknuti i da senzor radi" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" -"Senzor filamenta nije se aktivirao tijekom punjenja filamenta. Osigurajte da " -"je filament dosegao fsenzor i da senzor radi." +"Senzor filamenta nije se aktivirao tijekom punjenja filamenta. Osigurajte da" +" je filament dosegao fsenzor i da senzor radi." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Senzor fil. aktivirao se prerano tijekom punjenja u ekstruder. Provjerite da " -"li je nešto zapelo u PTFE cijevi. Ocitava li senzor ispravno." +"Senzor fil. aktivirao se prerano tijekom punjenja u ekstruder. Provjerite da" +" li je nešto zapelo u PTFE cijevi. Ocitava li senzor ispravno." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -751,36 +750,37 @@ msgid "Filament used" msgstr "Iskoristeni fil." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Datoteka je nepotpuna. Svejedno nastaviti?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Zavrsni pokreti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Prvi sloj kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Prvo cu pokrenuti samotestiranje kako bih provjerio najcesce probleme sa " "montazom." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Protok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -789,28 +789,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Prednji print vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Prednj str[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Prednji/lijevi vent" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-kod izrezan za drugu razinu. Nastavite?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -819,28 +819,28 @@ msgstr "" "otkazan." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-kod izrezan za drugu vrstu printera. Nastavite?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model. Print " "je otkazan." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-kod izrezan za noviji firmware. Nastavite?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -849,35 +849,35 @@ msgstr "" "otkazan." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW podesavanje" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Grijac/Termostat" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Grijanje" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Grijanje je onemoguceno sigurnosnim mjeracem vremena." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Grijanje obavljeno." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +888,7 @@ msgstr "" "printanje." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +897,9 @@ msgstr "" "postupak postavljanja?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Visoka sna" @@ -910,48 +910,49 @@ msgid "Homing" msgstr "Navodjenje" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Zagrijati na 280C! Mlaznica promijenjena i stegnuta prema specifikacijama?" +msgstr "" +"Zagrijati na 280C! Mlaznica promijenjena i stegnuta prema specifikacijama?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend vent:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Sada cu pokrenuti z kalibraciju." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "KLIZAC NIJE PODESEN" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "KLIZAC NIJE POMAKNUT" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "NEVALJAN ALAT" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -960,17 +961,17 @@ msgstr "" "postavke u Postavke - HW Podesavanje - Celicne ploce." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Poboljšanje točke kalibracije podloge" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Info zaslon" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Obrada SD kartice" @@ -980,7 +981,7 @@ msgid "Insert filament" msgstr "Umetnite filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -988,40 +989,40 @@ msgstr "" "Umetnite filament (nemojte ga puniti) u ekstruder i zatim pritisnite gumb." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU jedinicu ili " "azurirati firmware. Ako se problem nastavi, obratite se podrsci." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Je li filament napunjen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Je li celicna ploca na grijanoj podlozi?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Ponavljanje" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Zadnji print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Zadnji neusp. print" @@ -1031,57 +1032,57 @@ msgid "Left" msgstr "Lijevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Lijevi hotend vent?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Lijeva str[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Razina svjet" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Razina zatam" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Lin. ispravak" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Live podesavanje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Puni sve" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Napunite filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Punjenje u mlazn" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1091,69 +1092,70 @@ msgid "Loading color" msgstr "Ucitavanje boje" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Punjenje filamenta" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Labava remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Glasno" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "POTREBNO AZURIRANJE" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interna pogreska firmware MMU-a, resetirajte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NE ODGOVARA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ponovni pokusaj: Vracanje temperature..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST N USPIO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU ne uspijeva" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Neusp. MMU punj" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1162,7 +1164,7 @@ msgstr "" "problem nastavi, obratite se podrsci." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1171,23 +1173,23 @@ msgstr "" "nastavi, obratite se podrsci." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 spojen" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnet. komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Nazad" @@ -1197,83 +1199,84 @@ msgid "Measured skew" msgstr "Mjereni nagib" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Mjerenje referentne visine kalibracijske tocke" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mreza" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Izrav. mrez. podl" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Promjena moda u tijeku..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Vise detalja online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Pomaknite X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Pomaknite Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Pomaknite Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Pomaknite os" @@ -1284,65 +1287,64 @@ msgid "Moving selector" msgstr "Pomicanje odabiraca" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Dostupna nova verzija firmwera:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Nema SD kartice" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Bez pomaka." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Nema" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nije povezano" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Ne okrece se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1350,30 +1352,33 @@ msgstr "" "podloge." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Sada cu zagrijati mlaznicu za PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Sada uklonite probni print sa celicne ploce." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Mlaznica" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Promjena mlaznice" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Mlaznica." @@ -1384,82 +1389,82 @@ msgid "OK" msgstr "Ok" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Pronadene stare postavke. Postavit ce se zadani PID, Esteps itd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Jednom" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUZIRAN TERMAL EROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kal. zavrsena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibracija" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA se Zagrijava" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Kalibracija PINDA nije uspjela" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1468,7 +1473,7 @@ msgstr "" "Postavke->PINDA. kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "REMENICA SE NE MICE" @@ -1479,13 +1484,13 @@ msgid "Parking selector" msgstr "Selektor parkiranja" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pauzirajte print" @@ -1496,7 +1501,7 @@ msgid "Performing cut" msgstr "Izvodjenje reza" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1505,7 +1510,7 @@ msgstr "" "mlaznica uhvati papir, odmah iskljucite printer." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1514,33 +1519,33 @@ msgstr "" "ponovnim pokretanjem printera." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Provjerite IR prikljucak senzora, izvadite filament ako postoji." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Molimo provjerite:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Ocistite grijacu podlogu, a zatim pritisnite gumb." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Molimo ocistite mlaznicu radi kalibracije. Kliknite kada ste gotovi." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Umetnite filament u ekstruder, a zatim pritisnite gumb za punjenje." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1548,73 +1553,73 @@ msgstr "" "Umetnite filament u prvu cijev MMU-a, a zatim pritisnite gumb za punjenje." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Molimo prvo ubacite filament." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Molimo otvorite klizac i rucno uklonite filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Stavite celicnu plocu na grijacu podlogu." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Pritisnite gumb za praznjenje filamenta" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Molimo odmah izvucite filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Najprije uklonite prijevozne osloce." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Molimo uklonite celicnu plocu sa grijace podloge." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Prvo pokrenite XYZ kalibraciju." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Prvo izvadite filament, a zatim ponovite ovu radnju." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Molimo nadogradite." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Molimo pricekajte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Prekidi struje" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Predgrijavanje" @@ -1624,28 +1629,28 @@ msgid "Preheat the nozzle!" msgstr "Predgr. mlaznicu!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Predgrijavanje mlaznice. Molim vas pricekajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Predgr. za rezanje" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Predgr. za izbaci." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Predgr. za punjenje" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Predgr. za praznj." @@ -1656,33 +1661,33 @@ msgid "Preparing blade" msgstr "Priprema ostrice" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Pritisnite gumb" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Pritisnite gumb za predgrijavanje mlaznice i nastavite." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Print je prekinut" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Vent printa:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Printaj sa SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Print pauziran" @@ -1692,35 +1697,35 @@ msgid "Print time" msgstr "Vrijeme printanja" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Printer IP Adr:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Printer jos nije kalibriran. Molimo slijedite prirucnik, poglavlje Prvi " "koraci, odjeljak Tijek kalibracije." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Promjer mlaznice printera razlikuje se od G-koda. Molimo provjerite " "vrijednost u postavkama. Print je otkazan." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motor remenice zastao. Provjerite moze li se remenica pomicati i provjerite " @@ -1733,39 +1738,39 @@ msgid "Pushing filament" msgstr "Guranje filamenta" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "RED PUN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi utor" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Zad. str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Oporavak printa" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Uklonite stari filament i pritisnite gumb za pocetak stavljanja novog " "filamenta." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Preimenuj" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1774,29 +1779,24 @@ msgstr "" "za indeks alata izvan raspona (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Resetiraj" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Nastavite print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Nastavak printa" @@ -1807,7 +1807,7 @@ msgid "Retract from FINDA" msgstr "Izvuci iz FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Retry" @@ -1823,12 +1823,12 @@ msgid "Right" msgstr "Tocno" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Desna str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1837,39 +1837,39 @@ msgstr "" "ispocetka. Nastavite?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD karti" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "IZBORNIK NE PODESEN" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "IZBORNIK SE NE MICE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ZAUSTAVLJENO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Trazenje tocke kalibracije podloge" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Odaberi" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1877,32 +1877,28 @@ msgstr "" "Odaberite filament za Kalibraciju Prvog Sloja i odaberite ga u izborniku na " "zaslonu." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Odaberite ekstruder:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Odaberi filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Izaberi jezik" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" -"Odaberite temperaturu predgrijavanja mlaznice koja odgovara vasem materijalu." +"Odaberite temperaturu predgrijavanja mlaznice koja odgovara vasem " +"materijalu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Odaberite temperaturu koja odgovara vasem materijalu." @@ -1913,58 +1909,58 @@ msgid "Selecting fil. slot" msgstr "Odabir fil. utora" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Samotestiranje OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Pocetak selftesta" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Selftest error!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Selftest nije uspio" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Provest ce se selftest radi kalibracije preciznog ponovnog postavljanja bez " "senzora." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info senzora" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Senzor je provjeren, odmah uklonite filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Postavi temperaturu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Postavke" @@ -1974,13 +1970,13 @@ msgid "Severe skew" msgstr "Veliki nagib" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Ploca" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1993,13 +1989,13 @@ msgstr "" "%cResetiraj" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Pokazi granicnike" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Tih" @@ -2009,180 +2005,174 @@ msgid "Slight skew" msgstr "Lagani nagib" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." msgstr "" -"Neke datoteke nece biti razvrstane. Max. Br. datoteka u 1 mapi za sortiranje " -"je 100." +"Neke datoteke nece biti razvrstane. Max. Br. datoteka u 1 mapi za sortiranje" +" je 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Naisao je neki problem, nametnuto Z-niveliranje..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Vrsta" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sortiranje datoteka" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Brzina" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Okrece se" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" -"Potrebna je stabilna temperatura okoline 21-26C, potrebno je cvrsto postolje." +"Potrebna je stabilna temperatura okoline 21-26C, potrebno je cvrsto " +"postolje." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Tiho" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Celicna ploca" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Zaustavi print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Strogo" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Podrska" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Zamjenjeno" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "TERMALNA ANOMALIJA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC GRESKA DRAJVERA" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC RESET DRAJVERA" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRAJVER SKRACEN" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC GRESKA PREGRIJAN" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC NISKA VOLTAZA" #. 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 "Toplinski model kal. traje cca. 12 min. Pogledajte\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Toplinski model kal. traje cca. 12 min. Pogledajte\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Toplinski model još nije kalibriran." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Testiram filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Klizac se ne može podesiti. Provjerite postoji li nesto sto sprjecava " "njegovo kretanje." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"MMU jedinica prijavljuje svoju FW verziju nekompatibilnu s firmwerom " -"printera. Provjerite je li MMU firmware azuriran." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2190,7 +2180,7 @@ msgstr "" "sprjecava njegovo kretanje." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2200,7 +2190,7 @@ msgstr "" "optimalnu visinu. Provjerite slike u prirucniku (poglavlje Kalibracija)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2209,24 +2199,24 @@ msgstr "" "poglavlje Prvi koraci, odjeljak Tijek kalibracije." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Vrijeme" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Pauza" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Ukupno" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Totalne pogreske" @@ -2241,39 +2231,30 @@ msgid "Total print time" msgstr "Vrijeme printanja" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Ugodi" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "ISPRAZNI RUCNO" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Neocekivano FINDA citanje. Uvjerite se da nijedan filament nije ispod FINDA " -"i da je birac slobodan. Provjerite FINDA vezu." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Prazni" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Ispraznite fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Praznjenje filamenta" @@ -2290,23 +2271,23 @@ msgid "Unloading to pulley" msgstr "PRAZNJ DO REMENICE" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Provjera nije uspjela, uklonite filament i pokusajte ponovno." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Voltaza" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "UPOZORENJE TMC VRUC" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2318,123 +2299,122 @@ msgstr "" "u tihom modu" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Ceka se korisnik..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Ceka se hladenje PINDA sonde" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Ceka se hladjenje mlaznice i podloge" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Upozore" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Upozorenje: promijenjeni su i tip printera i tip maticne ploce." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Upozorenje: tip maticne ploce je promijenjen." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Upozorenje: promijenjena je vrsta printera." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Je li praznjenje fil. bilo uspjesno?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Greska u ozicenju" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Carobnjak" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-ispravan:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH validacija" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ detalji kal" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibracija u redu. Iskrivljenost ce se automatski ispraviti." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibracija je u redu. Osi X/Y su malo nagnute. Bravo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "XYZ kalibracija je ugrozena. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ kalibracija je ugrozena. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "XYZ kalibracija nije uspjela. Tocka kalibracije podloga nije pronadena." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "XYZ kalibracija nije uspjela. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracija nije uspjela. Molimo pogledajte prirucnik." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ kalibracija nije uspjela. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracija u redu. Osi X/Y su okomite. Cestitamo!" @@ -2444,34 +2424,34 @@ msgid "Y distance from min" msgstr "Y distanca od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-ispravan:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Carobnjak uvijek mozete nastaviti iz Kalibracija -> Carobnjak." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-ispravan:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-sonda br." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] razmak tocke" @@ -2481,38 +2461,122 @@ msgid "and press the knob" msgstr "i pritisnite gumb" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "da napuni filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "da isprazni filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "nepoznato" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "nepoznato stanje" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Osvjeziti" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Neusp. MMU nap" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Odaberite ekstruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU jedinica prijavljuje svoju FW verziju nekompatibilnu s firmwerom " +#~ "printera. Provjerite je li MMU firmware azuriran." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Neocekivano FINDA citanje. Uvjerite se da nijedan filament nije ispod FINDA " +#~ "i da je birac slobodan. Provjerite FINDA vezu." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2567,9 +2631,6 @@ msgstr "🔃Osvjeziti" #~ msgid "MMU needs user attention." #~ msgstr "MMU treba paznju korisnika." -#~ msgid "MMU power fails" -#~ msgstr "Neusp. MMU nap" - #~ msgid "More⏬" #~ msgstr "Jos⏬" @@ -2594,8 +2655,7 @@ msgstr "🔃Osvjeziti" #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "" -#~ "XYZ kalibracija je ugrozena. Lijeva prednja tocka kalibracije nije " -#~ "dostupna." +#~ "XYZ kalibracija je ugrozena. Lijeva prednja tocka kalibracije nije dostupna." #~ msgid "XYZ calibration failed. Left front calibration point not reachable." #~ msgstr "" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 2e68da507..2e1efd759 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 vagy regebbi" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 v. ujabb" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "Vart szint: %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Megsem" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Z allitasa:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Minden rendben" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Keszen vagyunk. Jo nyomtatast!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Abece" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Mindig" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Kornyezet" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "A Z tengely a felso vegponton van?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Seged" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Autom." #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto homeolas" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Auto ero" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Fil. auto.betolt." @@ -115,110 +114,110 @@ msgid "Avoiding grind" msgstr "Daralas megelozese" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Tengely" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Tengely hossz" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Vissza" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Asztal" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Asztal futes" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Asztal kesz" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Szint. korrekcio" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." msgstr "" -"Sikertelen asztal szintezes. A szenzor nem kapcsolt. Piszok a fuvokan? Varom " -"az ujrainditast." +"Sikertelen asztal szintezes. A szenzor nem kapcsolt. Piszok a fuvokan? Varom" +" az ujrainditast." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Asztal/Fej futes" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Szij allapot" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Szij teszt" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Aramkieses volt, nyomt. folytatasa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Fenyes" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Fenyero" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "KOMUNIKACIOS HIBA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "XYZ kalibracio" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Z kalibracio" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +226,13 @@ msgstr "" "nem er, majd nyomd meg ha keszen vagy." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Z kalibralasa" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,45 +241,46 @@ msgstr "" "er, majd nyomd meg ha keszen vagy." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Home poz. kalibralas" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibracio" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibracio kesz" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Nem tudom mozgatni a Fejet vagy a Gorgot" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "A muvelet nem hajthato vegre, a filament mar be van toltve. Vedd ki elobb." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Kartya eltavolitva" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Cserelj SD kartyat" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Filament csere" @@ -295,55 +295,55 @@ msgid "Changed correctly?" msgstr "Sikerult a csere?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "X tengely ellenorzes" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Y tengely ellenorzes" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Z tengely ellenorzes" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Asztal ellenorzese" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Vegallaskapcs. ellen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Fajl ellenorzese" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Hotend ellenorzese" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Szenz. ellenorzese" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Ellenorzesek" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "TM hiba törlése" @@ -353,12 +353,12 @@ msgid "Color not correct" msgstr "Szin nem jo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Kozossegi" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Folyt" @@ -368,31 +368,31 @@ msgid "Cooldown" msgstr "Lehutes" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kivalasztott nyelv masolasa?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Utkozes" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Utkozes erz." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Utkozes erzekelve." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,34 +403,34 @@ msgstr "" "kapcsolhato be" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Filament vagasa" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Vago" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Sotet" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Letilt" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Motorok kikapcsol." @@ -442,19 +442,19 @@ msgid "Disengaging idler" msgstr "Gorgo levalasztasa" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "A fuvoka vege es a targyasztal felulete kozotti tavolsag nincs beallitva. " -"Kerlek, kovesd az utmutato Elso lepesek fejezeteben az Elso reteg kalibracio " -"bekezdest." +"Kerlek, kovesd az utmutato Elso lepesek fejezeteben az Elso reteg kalibracio" +" bekezdest." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -463,12 +463,12 @@ msgstr "" "asztal kozotti tavolsagot?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Kesz" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-korrekcio:" @@ -502,8 +502,8 @@ msgid "ERROR:" msgstr "HIBA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Kiadás az MMUból" @@ -515,17 +515,17 @@ msgid "Ejecting filament" msgstr "Filament kiadasa" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Vegallaskapcsolo" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Vegallask. nem kapcs" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Vegallaskapcsolok" @@ -537,47 +537,45 @@ msgid "Engaging idler" msgstr "Gorgo becsatolasa" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autobetolt" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Dugul. eszlel" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. fogyas" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT MAR BENT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NEM KAPCSOLT" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -586,76 +584,76 @@ msgstr "" "fil. utjat es a FINDA mukodeset." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" -"A FINDA nem kapcsolt filament betoltese kozben. Ellenorizd a fil. utjat es a " -"FINDA mukodeset." +"A FINDA nem kapcsolt filament betoltese kozben. Ellenorizd a fil. utjat es a" +" FINDA mukodeset." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. SZORULT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FSz akcio" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSZENZOR NEM KAPCSOL" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSZENZ. TUL HAMAR" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSZENZOR: F SZORULT" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW FUTAS HIBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Hiba statisztika" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "MMU hiba stat." #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Hamis kivalto ok" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Vent. sebesseg" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Ventillator teszt" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Vent.proba" @@ -684,22 +682,23 @@ msgid "Feeding to nozzle" msgstr "Fuvokahoz toltes" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. kifutasok" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. szenzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -715,14 +714,14 @@ msgid "Filament not loaded" msgstr "Fil. nincs betoltve" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Filament szenzor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -731,16 +730,16 @@ msgstr "" "filament utjat es a szenort." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" -"A filament szenzor nem kapcsolt be a filament betoltese kozben. Ellenorizd a " -"filament utjat es a szenort." +"A filament szenzor nem kapcsolt be a filament betoltese kozben. Ellenorizd a" +" filament utjat es a szenort." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -754,36 +753,37 @@ msgid "Filament used" msgstr "Felhasznalt filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "A fajl vege hianyzik. Folytatod igy is?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Mozdulat befejezese" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Elso reteg kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Elsokent lefuttatom az onellenorzest, hogy megnezzem a leggyakoribb " "osszeszerelesi problemakat." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,28 +792,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Elso targyhuto vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Elulso old[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Elso/bal ventillator" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "A G-kod mas szintre lett elokesztve. Folytassam?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -822,28 +822,28 @@ msgstr "" "megallitva." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "A G-kod mas nyomtato tipusra lett elokesztve.Folytassam?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt. " "Nyomtatas megallitva." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "A G-kod ujabb firmverre lett elokesztve.Folytassam?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -852,35 +852,35 @@ msgstr "" "Nyomtatas megallitva." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW beallitas" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Futotest/Termisztor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Futes folyamatban" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "A bizonsagi idozito leallitotta a futest" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Futes kesz." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,18 +891,18 @@ msgstr "" "nyomtathatsz is." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" -"Szia, en vagyok az eredeti Prusa i3 nyomtatod. Szeretned, ha vegigvezetnelek " -"a beallitasi folyamaton?" +"Szia, en vagyok az eredeti Prusa i3 nyomtatod. Szeretned, ha vegigvezetnelek" +" a beallitasi folyamaton?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Magas ero" @@ -913,48 +913,48 @@ msgid "Homing" msgstr "Homeolas" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "A hotend 280C-os! Fuvoka kicserleve es kelloen meghuzva?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Lefuttatom az XYZ kalibraciot. Ez akár 24 percig is eltarthat." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Lefuttatom a Z kalibraciot." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "GORGO NEM MOZOG" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "GORGO NEM MOZOG" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "HELYTELEN SZERSZAM" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -963,17 +963,17 @@ msgstr "" "Acellapok menupont alatt." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Bed kalibracio pontositasa" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Info kepernyo" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "SD kartya inic." @@ -983,7 +983,7 @@ msgid "Insert filament" msgstr "Helyezd be a filam." #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -992,40 +992,40 @@ msgstr "" "gombot." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret. Ha a " "problema fennall, fordulj a supporthoz." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Filament behelyezve?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Rajta van az acellap a targyasztalon?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteracio" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Utolso nyomtatas" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Utolso nyomt. hibak" @@ -1035,57 +1035,57 @@ msgid "Left" msgstr "Bal" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Bal hotend vent.?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Bal [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Fenyes szint" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Sotet szint" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Lin. korrekcio" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Z magassag beall." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Ossz.bet" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Filament betolt." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Betolt. fuvokahoz" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1095,69 +1095,70 @@ msgid "Loading color" msgstr "Szin tisztitasa" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Filament betoltese" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Laza szijtarcsa" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Hangos" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW FRISSIT. KELL" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware hiba, kerlek inditsd ujra az MMU-t" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NEM VALASZOL" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ujra: Homerseklet visszaallitasa" #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST HIBA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU hibak" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU bet. hibak" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1166,32 +1167,32 @@ msgstr "" "problema fennall, keresd a supportot." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a problema " -"fennall, keresd a supportot." +"Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a problema" +" fennall, keresd a supportot." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 csatlakozott" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnes komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Fomenu" @@ -1201,83 +1202,84 @@ msgid "Measured skew" msgstr "Meroleg. hiba" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Kalibracios pont magassaganak merese" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Halo" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Asztal szintezes" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Modvaltas folyamatban..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Tovabbi reszletek a neten." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "X mozgatasa" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Y mozgatasa" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Z mozgatasa" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Tengely mozgatasa" @@ -1288,95 +1290,97 @@ msgid "Moving selector" msgstr "Szelektor mozgatasa" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Uj firmver verzio erheto el:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nem" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Nincs SD kartya" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Nincs mozgas." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Nincs" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nincs csatlakoztatva" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Nem forog" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Most beallitjuk a fuvoka hegye es a targyasztal felulete kozotti tavolsagot." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Felfutom a fuvokat PLA-hoz." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Vedd le a tesztnyomatot az acellaprol." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Fuvoka" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Fuvoka csereand" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Fuv. atm." @@ -1387,89 +1391,90 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Ki" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Regi beallitasokat talaltam. Az alap PID, Esteps, stb. lesz beallitva." +msgstr "" +"Regi beallitasokat talaltam. Az alap PID, Esteps, stb. lesz beallitva." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Be" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Egyszer" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "SZUNET HOMERSEK.HIBA" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kalibracio" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kal. kesz" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibracio" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA Futes" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA kalibracio sikertelen." #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." msgstr "PINDA kalibracio sikeres es aktiv. A Beallitasok ->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "GORGO NEM MOZOG" @@ -1480,13 +1485,13 @@ msgid "Parking selector" msgstr "Szelektor parkolasa" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Szun." #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Nyomtatas szunet" @@ -1497,7 +1502,7 @@ msgid "Performing cut" msgstr "Filament vagas" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1506,7 +1511,7 @@ msgstr "" "fuvoka hozzaer a papirlaphoz, azonnal kapcsold ki a nyomtatot." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1515,29 +1520,29 @@ msgstr "" "folytathatod az uzembe helyezest a nyomtato ujrainditasaval." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Nezd meg az IR szenzor csatlakoz., vedd ki a filam., ha bent van." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Kerlek ellenorizd:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Kerlek, tisztisd le a targyasztalt, majd nyomd meg a gombot." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" "Kerlek, tisztisd meg a fuvokat kalibracio elott. Nyomd meg a gombot, ha " "keszen vagy." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1545,7 +1550,7 @@ msgstr "" "betolteshez." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1554,74 +1559,74 @@ msgstr "" "a betolteshez." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Kerlek eloszor toltsd be a filamentet." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "" "Kerlek, nyisd ki a nyomogorgo ajtajat, es tavolitsd el a filamentet kezzel." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Kerlek, helyzed az acellapot a targyasztalra." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Kerlek, nyomd meg a gombot a filament kiadasahoz" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Kerlek, huzd ki a filamentet most" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Tavolitsd el a szallitasi segedanyagokat." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Kerlek, tavolisd el az acellapot az asztalrol." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Kerlek, elobb futtasd le az XYZ kalibraciot." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Kerlek eloszor vedd ki a filamentet, majd probalkozz ujra." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Kerlek frissits." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Kerlek varj" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Aramkimaradasok" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Elofutes" @@ -1631,28 +1636,28 @@ msgid "Preheat the nozzle!" msgstr "Futsd fel a fuvokat!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Fuvoka futese folyamatban. Kerlek, varj." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Melegites vagashoz" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Melegites kiadashoz" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Felfutes betolteshez" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Felfutes kiadashoz" @@ -1663,33 +1668,33 @@ msgid "Preparing blade" msgstr "Penge elokeszites" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Nyomd meg a gombot" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Nyomd meg a gombot a folytatashoz es a fuvoka felfutesehez." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Nyomt. megszakitva" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Targyhuto:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Nyomtatas SD-rol" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Nyomt. szuneteltetve" @@ -1699,35 +1704,35 @@ msgid "Print time" msgstr "Nyomtatasi ido" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Nyomtato IP cime:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "A nyomtato meg nem volt bekalibralva. Kerlek, kovesd az utmutato Elso " "lepesek fejezetenek Kalibracio menete bekezdeset." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "A nyomtato fuvoka atmeroje elter a G-kodtol. Ellenorizd az erteket a " "beallitasokban. Nyomtatas megallitva." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "Gorgo motor nem mozog. Ellenorizd hogy tud-e mozogni es a kabelezest." @@ -1738,39 +1743,39 @@ msgid "Pushing filament" msgstr "Filament benyomasa" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "SOR TELE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Hatso old.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Nyomt. visszaallit" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Vedd ki a regi filamentet, majd nyomd meg a gombot az uj filament " "betoltesehez." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Atnevezes" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1779,29 +1784,24 @@ msgstr "" "kivuli ertekeket a G kodban." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Ujrainditas" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "MMUreszet" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "XYZ kal. nullazas" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Nyomt. folytatasa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Nyomtatas folytatasa" @@ -1812,7 +1812,7 @@ msgid "Retract from FINDA" msgstr "FINDAtol visszahuz" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Ujra" @@ -1828,12 +1828,12 @@ msgid "Right" msgstr "Jobb" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Jobb old.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1842,71 +1842,66 @@ msgstr "" "fog mindent kezdeni. Folytatod?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SDkartya" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SZELEKTOR NEM HOMEOL" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SZELEKTOR NEM MOZOG" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "MEGALLITVA." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Kalibracios pont keresese az asztalon" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Kivalasztas" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Valassz egy filamentet az elso reteg kalibraciojahoz a menubol." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Extruder valasztas:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Valassz filamentet:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Valassz nyelvet" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Valaszd ki a fuvoka homersekletet, amelyik megfelel az altalad hasznalt " "anyaghoz ajanlott homersekletnek." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Valassz homersekletet, ami megfelel a filamenthez." @@ -1917,57 +1912,57 @@ msgid "Selecting fil. slot" msgstr "Fil.poz.kivalasztasa" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Ondiagnosztika OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Ondiagnosztika indul" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Ondiagnosztika" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Ondiagnosztika hiba!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Ondiag. sikertelen" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "A pontos szenzor nelkuli homing erdekeben lefuttatom az ondiagnosztikat." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Szenzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Szenzor OK, vedd ki a filamentet most." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Homerseklet beall.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Beallitasok" @@ -1977,13 +1972,13 @@ msgid "Severe skew" msgstr "NagyMerol.hiba" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Acellap" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1996,13 +1991,13 @@ msgstr "" "%cUjrainditas" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Vegallaskapcsolok" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Halk" @@ -2012,7 +2007,7 @@ msgid "Slight skew" msgstr "Kis merol.hiba" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2021,170 +2016,163 @@ msgstr "" "konyvtaron belul." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Hiba tortent, Z szintezes indul..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Rendez" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Fajlok rendezese" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Hang" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Sebesseg" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Forog" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil 21-26C homerseklet es egy merev allvany (asztal) szukseges." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statisztika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Halk" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Acellapok" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Allj" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Nyomt. megallitasa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Szigoru" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Tamogatas" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Felcserelve" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "Homersekl. anomalia" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER HIBA" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESZET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER ZARLAT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC TULHEVULES HIBA" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ALACSONY FESZ." #. 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 "Termikus modell kal. kb. 12 percet. Lásd\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Termikus modell kal. kb. 12 percet. Lásd\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "A termikus modell még nincs kalibrálva." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Homerseklet" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Homersekletek" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Filament tesztelese" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "A gorgo nem tud rendesen homeolni. Nezd meg, hogy gatolja-e valami a " "mozgasat." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"Az MMU FW verzioja nem kompatibilis a nyomtatoeval. Kerlek frissitsd az MMU " -"firmwaret." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2192,7 +2180,7 @@ msgstr "" "mozgasat." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2203,33 +2191,33 @@ msgstr "" "Kalibracio fejezeteben." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" -"Meg mindig szukseges a Z kalibracio. Kerlek, kovesd az utmutato Elso lepesek " -"fejezetenek Kalibracio menete bekezdeset." +"Meg mindig szukseges a Z kalibracio. Kerlek, kovesd az utmutato Elso lepesek" +" fejezetenek Kalibracio menete bekezdeset." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Ido" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Idotullepes" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Ossz." #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Ossz. hiba" @@ -2244,39 +2232,30 @@ msgid "Total print time" msgstr "Ossz. nyomt. ido" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Finomhangolas" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "VEDD KI KEZZEL" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Varatlan FINDA ertek. Gyozodj meg rola hogy nincs a FINDA alatt filament es " -"a szelektor ures. Nezd meg a FINDA csatlakozasat." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Kiadas" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Filament kiadasa" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Filament kiadasa" @@ -2293,23 +2272,23 @@ msgid "Unloading to pulley" msgstr "Kiadas a gorgohoz" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Ellenorzes sikertelen, vedd ki a filamentet es probald ujra." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Feszultsegek" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "FIGYELEM A TMC FORRO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2322,126 +2301,125 @@ msgstr "" "Halk modban" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Var. a felhasznalora" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "A PINDA szenzor kihuleset varom." #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "A fuvoka es az asztal kihuleset varom." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Figylem." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Figyelem: a nyomtato es az alaplap tipusa is megvaltozott." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Figyelem: az alaplap tipusa megvaltozott." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Figyelem: a nyomtato tipusa megvaltozott." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Sikerult kivenni a filamentet?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Kabelezesi hiba" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Varazslo" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-korrekcio:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH inicializal" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ kal. reszlet" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ kalibracio OK. Az esetleges X/Y merolegessegi hiba automatikusan " "korrigalva lesz." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "XYZ kalibracio sikerult. Az X/Y tengelyeken enyhe merolegessegi hiba van." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Az XYZ kalibracio sikertelen. Az asztal kalibracios pontja nem erheto el." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracio sikertelen. Kerlek, nezz bele a kezikonyvbe." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracio OK. Az X/Y tengelyek merolegesek. Gratulalok!" @@ -2451,34 +2429,34 @@ msgid "Y distance from min" msgstr "Y-minimum tavolsag" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-korrekcio:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Igen" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "A Varazsolt barmikor elered a Kalibracio -> Varazslo menubol." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-korrekcio:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z meres szama" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] pont offszet" @@ -2488,38 +2466,122 @@ msgid "and press the knob" msgstr "es nyomd meg a gombot" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "filam. betoltesehez" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "filament kiadasahoz" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "ismeretlen" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "ismeretlen allapot" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Frissites" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU tap hibak" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "MMUreszet" + +#~ msgid "Select extruder:" +#~ msgstr "Extruder valasztas:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "Az MMU FW verzioja nem kompatibilis a nyomtatoeval. Kerlek frissitsd az MMU " +#~ "firmwaret." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Varatlan FINDA ertek. Gyozodj meg rola hogy nincs a FINDA alatt filament es " +#~ "a szelektor ures. Nezd meg a FINDA csatlakozasat." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "Filament autom. betolteste csak bekapcs. fil. szenzorral mukodik." @@ -2572,9 +2634,6 @@ msgstr "🔃Frissites" #~ msgid "MMU needs user attention." #~ msgstr "Az MMU felhasznaloi figyelmet igenyel." -#~ msgid "MMU power fails" -#~ msgstr "MMU tap hibak" - #~ msgid "More⏬" #~ msgstr "Tobb⏬" @@ -2611,8 +2670,8 @@ msgstr "🔃Frissites" #~ "nem ajanlott a hasznalata." #~ msgid "" -#~ "You are using firmware beta version. This is development version. Using " -#~ "this version is not recommended and may cause printer damage." +#~ "You are using firmware beta version. This is development version. Using this" +#~ " version is not recommended and may cause printer damage." #~ msgstr "" #~ "A firmware beta verziojat hasznalod. Ez egy fejlesztoknek szant verzio es " #~ "nem ajanlott a hasznalata." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index d7256df22..a09a88dad 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 o inferiore" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 o superiore" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "atteso livello %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Annulla" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Compensaz. Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Nessun errore" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabeti" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Sempre" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Trova origine" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Automatico" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autocaric. filam." @@ -106,7 +105,8 @@ msgstr "Autocaric. filam." #: ../../Firmware/ultralcd.cpp:2294 msgid "" "Autoloading filament is active, just press the knob and insert filament..." -msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filam." +msgstr "" +"Caricamento automatico attivo, premi la manopola e inserisci il filam." #. MSG_PROGRESS_AVOID_GRIND c=20 #: ../../Firmware/mmu2_progress_converter.cpp:16 @@ -115,53 +115,53 @@ msgid "Avoiding grind" msgstr "Evito triturazione" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Assi" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Lunghezza dell'asse" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Indietro" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Piano" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Riscald. piano" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Piano fatto." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Correz. liv.piano" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,55 +170,55 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Piano/Riscald." #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Stato cinghie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test cinghie" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare stampa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Chiaro" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Luminosita'" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "ERRORE COMUNICAZIONE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Calibra XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Calibra Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +227,13 @@ msgstr "" "all'altezza massima. Click per terminare." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,45 +242,47 @@ msgstr "" "all'altezza massima. Click per terminare." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Calibrazione Home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Calibrazione" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Calibr. completa" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Impossibile spostare il Selettore o l'Idler" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" -"Impossibile eseguire l'azione, il filamento è già caricato. Scaricarlo prima." +"Impossibile eseguire l'azione, il filamento è già caricato. Scaricarlo " +"prima." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "SD rimossa" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Cambia scheda SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Cambia filamento" @@ -295,55 +297,55 @@ msgid "Changed correctly?" msgstr "Cambio corretto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Verifica asse X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Verifica asse Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Verifica asse Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Verifica piano" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Verifica finecorsa" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Verifica file" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Verifica ugello" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Controllo sensori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Controlli" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Cancella errore TM" @@ -353,12 +355,12 @@ msgid "Color not correct" msgstr "Colore non puro" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Contribuiti" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Cont." @@ -368,31 +370,31 @@ msgid "Cooldown" msgstr "Raffredda" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Impatto" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Rileva.crash" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Rilevato impatto." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,34 +405,34 @@ msgstr "" "in Modalita normale" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Taglia filamento" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Tagliatr." #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Scuro" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Disattiva" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Disattiva motori" @@ -442,32 +444,32 @@ msgid "Disengaging idler" msgstr "Distacco idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Distanza tra la punta dell'ugello e la superficie del piano non ancora " "impostata. Seguire manuale, Primi Passi, Calibrazione primo strato." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" msgstr "" -"Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e " -"piatto?" +"Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e" +" piatto?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Fatto" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Correzione-E:" @@ -501,8 +503,8 @@ msgid "ERROR:" msgstr "ERRORE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Espelli da MMU" @@ -514,17 +516,17 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Finecorsa" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Finec. fuori portata" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Finecorsa" @@ -536,56 +538,54 @@ msgid "Engaging idler" msgstr "Ingaggio idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Estrusore" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Info estrusore" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "Autocar.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Ril. blocco" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "Ril. fine fil" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAM GIA CARICATO" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NON ATTIVATA" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA non spenta durante scaric. filamento. Prova a scaricare manual. Verifi " -"che il fil. possa muoversi e che FINDA funzioni." +"FINDA non spenta durante scaric. filamento. Prova a scaricare manual. Verifi" +" che il fil. possa muoversi e che FINDA funzioni." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -594,67 +594,67 @@ msgstr "" "muoversi e che FINDA funzioni." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCC" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "Azione FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NON ATTIVATO" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR IN ANTICIPO" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL. BLOCC" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Stat. fallimenti" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falso innesco" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Velocita vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventola" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Control.vent" @@ -683,22 +683,23 @@ msgid "Feeding to nozzle" msgstr "Alim. in ugello" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. esauriti" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Sensore fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filamento" @@ -714,14 +715,14 @@ msgid "Filament not loaded" msgstr "Fil. non caricato" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Sensore filam." #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -730,7 +731,7 @@ msgstr "" "possa muoversi e che il sensore funzioni." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -739,7 +740,7 @@ msgstr "" "il filamento abbia raggiunto il sensore e che il sensore funzioni." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -754,36 +755,37 @@ msgid "Filament used" msgstr "Fil. utilizzato" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Finaliz. spostamenti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Cal. primo strato" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Per primo avviero l'autotest per controllare gli errori di assemblaggio piu " "comuni." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flusso" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,28 +794,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Ventola frontale?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Fronte [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Ventola frontale/sin" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code processato per un livello diverso. Continuare?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -822,28 +824,28 @@ msgstr "" "slice del modello. Stampa annullata." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code processato per una stampante diversa. Continuare?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code processato per un'altra stampante. Per favore rislice il modello. " "Annullamento stampa." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code processato per un FW piu recente. Continuare?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -852,35 +854,35 @@ msgstr "" "annullata." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "Impostazioni HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Riscald./Termist." #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Riscaldamento..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Riscald. completo" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,7 +893,7 @@ msgstr "" "stampare." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -900,9 +902,9 @@ msgstr "" "processo di configurazione?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Forte" @@ -913,48 +915,48 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 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:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Ventola hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare fino a 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER ERR. MOVIMENTO" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "IDLER BLOCCATO" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "STRUM NON VAL" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -963,17 +965,17 @@ msgstr "" "Setup HW - Piastre in Acciaio." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Miglioramento punto di calibrazione del piatto" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Schermata info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Inizial. scheda SD" @@ -983,7 +985,7 @@ msgid "Insert filament" msgstr "Inserire filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -991,40 +993,40 @@ msgstr "" "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Errore runtime interno. Provare a resettare l'unità MMU o ad aggiornare il " "FW. Se il problema persiste, contattare l'assistenza." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Piastra d'acciaio su piano riscaldato?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iterazione" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Ultima stampa" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Errori ultima stampa" @@ -1034,57 +1036,57 @@ msgid "Left" msgstr "Sinistra" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Vent SX hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Sinistra [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Liv. Chiaro" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Liv. Scuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Correzione lineare" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Compensazione Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Carica tutti" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Carica filamento" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Carica ugello" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1094,69 +1096,70 @@ msgid "Loading color" msgstr "Caricando colore" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Caricando filamento" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Puleggia lenta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Forte" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "AGG FW MMU NECESSARI" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Errore interno FW MMU, resettare la MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "Mod. MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NON RISPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Riprova. Ripristino temperatura..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST FALLITO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Fallimenti MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Car MMU falliti" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1165,32 +1168,32 @@ msgstr "" "problema persiste contatta il supporto." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"Unità MMU non risponde. Controlla cavi e connettori. Se il problema persiste " -"contatta il supporto." +"Unità MMU non risponde. Controlla cavi e connettori. Se il problema persiste" +" contatta il supporto." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 connessa" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Comp. Magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Menu principale" @@ -1200,83 +1203,84 @@ msgid "Measured skew" msgstr "Dev. misurata" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Griglia" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Liv. griglia piano" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mod." #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Cambio modalita in corso..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modello" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Piu dettagli online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motore" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Sposta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Sposta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Sposta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Muovi asse" @@ -1287,94 +1291,96 @@ msgid "Moving selector" msgstr "Muovo il selettore" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Nuova vers. FW disponibile:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Nessuna SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Nessun movimento." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Nessuno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normale" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Non connesso" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Non gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Adesso calibro la distanza fra ugello e superfice del piatto." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Ugello" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Cambio dell'ugello" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Dia.Ugello" @@ -1385,84 +1391,84 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Sono state trovate impostazioni vecchie. Verranno impostati i valori " "predefiniti di PID, Esteps etc." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Singolo" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERRORE TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "Calibrazione PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "Calib. PID completa" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "Calibrazione PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Calibrazione temperatura fallita" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1471,7 +1477,7 @@ msgstr "" "Impostazioni ->Calib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "PULEGGIA BLOCCATA" @@ -1482,13 +1488,13 @@ msgid "Parking selector" msgstr "Posteggio selettore" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Metti in pausa" @@ -1499,7 +1505,7 @@ msgid "Performing cut" msgstr "Eseguo taglio" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1508,7 +1514,7 @@ msgstr "" "punti. In caso l'ugello muova il foglio spegnere subito la stampante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1517,34 +1523,34 @@ msgstr "" "riprendi il Wizard." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Controllare il collegamento al sensore e rimuovere il filamento." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Verifica:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Pulisci il piatto, poi premi la manopola." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1553,73 +1559,73 @@ msgstr "" "caricarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Carica il filamento, per favore." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Posizionate la piastra d'acciaio sul piano riscaldato." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Rimuovete i materiali da spedizione" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Prego aggiornare." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Attendere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Interr. corr." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Preriscalda" @@ -1629,28 +1635,28 @@ msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Preriscalda. taglio" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Preriscalda. espuls." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Preriscald. carico" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Preriscald. scarico" @@ -1661,33 +1667,33 @@ msgid "Preparing blade" msgstr "Preparo la lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Premere la manopola" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Stampa interrotta" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Vent.stam:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Stampa da SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Stampa in pausa" @@ -1697,39 +1703,39 @@ msgid "Print time" msgstr "Tempo di stampa" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Ind. IP stampante:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo " "Primi Passi." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro ugello diverso da G-Code. Continuare?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. " "Stampa annullata." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" -"Il motore della puleggia è bloccato. Verifica che la puleggia possa muoversi " -"e controlla il cablaggio." +"Il motore della puleggia è bloccato. Verifica che la puleggia possa muoversi" +" e controlla il cablaggio." #. MSG_PROGRESS_PUSH_FILAMENT c=20 #: ../../Firmware/mmu2_progress_converter.cpp:23 @@ -1738,39 +1744,39 @@ msgid "Pushing filament" msgstr "Spingo il filamento" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "CODA PIENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "Porta RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Retro [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Recupero stampa" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Rimuovi il filamento precedente e premi la manopola per caricare il nuovo " "filamento." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Rinomina" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1779,29 +1785,24 @@ msgstr "" "Controllare l'indice strumento nel G-code (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Riprendi stampa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Riprendi stampa" @@ -1812,7 +1813,7 @@ msgid "Retract from FINDA" msgstr "Retrai da FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Riprova" @@ -1828,12 +1829,12 @@ msgid "Right" msgstr "Destra" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Destra [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1842,39 +1843,39 @@ msgstr "" "ricominciare dall'inizio. Continuare?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "Mem. SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELETTORE ERR MOVIM" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELETTORE BLOCCATO" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ARRESTATO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Ricerca punti calibrazione piano" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Seleziona" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1882,33 +1883,28 @@ msgstr "" "Scegli un filamento per la calibrazione del primo strato e selezionalo nel " "menu sullo schermo." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Seleziona estrusore:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Seleziona il filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Seleziona lingua" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al " "vostro materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." @@ -1919,56 +1915,56 @@ msgid "Selecting fil. slot" msgstr "Seleziono slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Autotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Avvia autotest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Autotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Errore Autotest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Autotest fallito" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info Sensore" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Imposta temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Impostazioni" @@ -1978,13 +1974,13 @@ msgid "Severe skew" msgstr "Deviaz. forte" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Piano" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1997,13 +1993,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Stato finecorsa" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Silenz." @@ -2013,7 +2009,7 @@ msgid "Slight skew" msgstr "Deviaz. lieve" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2022,128 +2018,127 @@ msgstr "" "e 100 perche siano ordinati." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Ordina" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Ordinando i file" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Suono" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Velocita" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Gira" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Sono necessari una temperatura ambiente di 21-26C e una superficie rigida." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistiche" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Silenz." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Piani d'acciaio" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Arresta stampa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Esatto" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Supporto" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Scambiato" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "ERRORE DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "RESET DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "CORTOCIRC TMC DRIVER" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "ERR TMC SURRISCALD" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2152,53 +2147,43 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Modello termico non calibrato." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Provo il filamento" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Idler non riesce a tornare in home correttamente. Verifica che non vi sia " "nulla che ne blocchi il movimento." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"L'unità MMU segnala la sua versione FW incompatibile con il FW della " -"stampante. Verifica che il FW della MMU sia aggiornato." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" -"Il selettore non riesce a tornare in home correttamente. Verifica che non vi " -"sia nulla che ne blocchi il movimento." +"Il selettore non riesce a tornare in home correttamente. Verifica che non vi" +" sia nulla che ne blocchi il movimento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2209,7 +2194,7 @@ msgstr "" "manuale (capitolo sulla calibrazione)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2218,24 +2203,24 @@ msgstr "" "Primi Passi - Sequenza di Calibrazione." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Cron." #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Totale fallimenti" @@ -2250,39 +2235,30 @@ msgid "Total print time" msgstr "Tempo stampa totale" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Regola" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "SCARICA MANUALMENTE" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Lettura FINDA inaspettata. Assicurati che non ci sia filamento sotto la " -"FINDA e che il selettore sia libero. Controlla connessione FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Scarica" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Scarica filam." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Scaricando filamento" @@ -2299,23 +2275,23 @@ msgid "Unloading to pulley" msgstr "Scarico in puleggia" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Voltaggi" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "ATTENZIONE TMC CALDO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2328,122 +2304,121 @@ msgstr "" "Modalita silenziosa" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Attendendo utente..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Avviso" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Attenzione: tipo di stampante e di scheda madre cambiati." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Errore cablaggio" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Correzione-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "Inizializza XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Calibrazione XYZ corretta. La distorsione verra compensata automaticamente." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato " "trovato." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibraz. XYZ fallita. Consultare manuale." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" @@ -2453,36 +2428,36 @@ msgid "Y distance from min" msgstr "Distanza Y dal min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Correzione-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "E possibile riprendere il Wizard in qualsiasi momento attraverso " "Calibrazione -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Correzione-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Nr. Z-test" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -2492,38 +2467,122 @@ msgid "and press the knob" msgstr "e cliccare manopola" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "per caricare il fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "per scaricare fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "sconosciuto" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "stato sconosciuto" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Ricaricare" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Manc. corr. MMU" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Seleziona estrusore:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "L'unità MMU segnala la sua versione FW incompatibile con il FW della " +#~ "stampante. Verifica che il FW della MMU sia aggiornato." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Lettura FINDA inaspettata. Assicurati che non ci sia filamento sotto la " +#~ "FINDA e che il selettore sia libero. Controlla connessione FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2577,9 +2636,6 @@ msgstr "🔃Ricaricare" #~ msgid "MMU needs user attention." #~ msgstr "Il MMU richiede attenzione dall'utente." -#~ msgid "MMU power fails" -#~ msgstr "Manc. corr. MMU" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Rimuovi il filamento e quindi premi la manopola." @@ -2604,5 +2660,4 @@ msgstr "🔃Ricaricare" #~ "Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." #~ msgid "XYZ calibration failed. Left front calibration point not reachable." -#~ msgstr "" -#~ "Calibrazione XYZ fallita. Punto anteriore sinistro non raggiungibile." +#~ msgstr "Calibrazione XYZ fallita. Punto anteriore sinistro non raggiungibile." diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 593b3077c..975ececed 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -11,94 +11,93 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 of ouder" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 of nieuwer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s niveau verwacht" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Annuleren" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Z is ingesteld:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Allemaal goed" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Klaar. Happy printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Altijd" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Kamertemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Zijn beide Z wagen heelemaal boven?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Startpositie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Auto power" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autoladen filament" @@ -116,53 +115,53 @@ msgid "Avoiding grind" msgstr "Slijpen vermijden" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "As" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Aslengte" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Terug" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Bed" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Bed opwarmen" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Bed klaar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Bed niveau correct" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -171,70 +170,70 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Bed/Verwarming" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Riem status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Riemtest" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Stroomstoring. Print herstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Helder" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Helderheid" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "COMMUNICATIEFOUT" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibratie XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibratie Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibreren van XYZ. Draai de knop om de Z-wagen omhoog te gaan tot het einde " -"stoppers. Druk knop als klaar." +"Kalibreren van XYZ. Draai de knop om de Z-wagen omhoog te gaan tot het einde" +" stoppers. Druk knop als klaar." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibrere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,46 +242,47 @@ msgstr "" "stoppers. Druk knop als klaar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibreren start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibratie" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibratie klaar" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Kan selector of spanrol niet bewegen." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "De actie kan niet worden uitgevoerd, de filament is al geladen. Eerst " "uitladen." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "SD verwijderd" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Wissel SD kaart" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Wissel filament" @@ -297,55 +297,55 @@ msgid "Changed correctly?" msgstr "Wissel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Controleer X as" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Controleer Y as" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Controleer Z as" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Controleer bed" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Controleer endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Bestand controle" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Controleer hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Controleer sensors" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Checks" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "TM-fout wissen" @@ -355,12 +355,12 @@ msgid "Color not correct" msgstr "Kleur niet juist" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Van de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Door." @@ -370,31 +370,31 @@ msgid "Cooldown" msgstr "Afkoelen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Geselecteerde taal kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Crashdet." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash gedetecteerd." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,34 +405,34 @@ msgstr "" "gebruikt worden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Fil. knippen" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Mes" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Dim" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Uitschak." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Motoren uit" @@ -444,11 +444,11 @@ msgid "Disengaging idler" msgstr "Ontkoppel spanrol" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Afstand tussen tip van de tuit en het print oppervlak is nog niet " @@ -456,7 +456,7 @@ msgstr "" "calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -465,12 +465,12 @@ msgstr "" "opnieuw in te stellen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Klaar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-correctie:" @@ -504,8 +504,8 @@ msgid "ERROR:" msgstr "FOUT:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Uitwerp. van MMU" @@ -517,17 +517,17 @@ msgid "Ejecting filament" msgstr "Fil. word ontladen" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Eindstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Endstop niet geraakt" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Eindstops" @@ -539,47 +539,45 @@ msgid "Engaging idler" msgstr "Koppel spanrol" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F.Jam ontdek." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "FS. uitloop" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT AL GELADEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA TRIGGERDE NIET" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -588,76 +586,76 @@ msgstr "" "ontladen. Controleer of Fil. kan bewegen en of de FINDA werkt." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" -"FINDA ging niet af bij het laden van de filament. Controleer of het filament " -"kan bewegen en FINDA werkt." +"FINDA ging niet af bij het laden van de filament. Controleer of het filament" +" kan bewegen en FINDA werkt." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA NIET FIL.VRIJ" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS actie" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSEN. NIET AF GEGAAN" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR TE VROEG" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR FIL. VAST" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FOUT" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Foutstatistieken" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "MMU-Fouten" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Valse triggering" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Fan snelh." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Fan test" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Fans check" @@ -686,22 +684,23 @@ msgid "Feeding to nozzle" msgstr "Voeding tot tuit" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. fouten" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -717,14 +716,14 @@ msgid "Filament not loaded" msgstr "Fil. niet geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Filamentsensor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -733,7 +732,7 @@ msgstr "" "Controleer of het filament kan bewegen en de sensor werkt." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -742,13 +741,13 @@ msgstr "" "Controleer of het filament de fsensor heeft bereikt en de sensor werkt." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Filament sensor te vroeg geactiveerd tijdens laden naar extruder. Controleer " -"of er niets vastzit in de PTFE-buis. Controleer of de sensor goed leest." +"Filament sensor te vroeg geactiveerd tijdens laden naar extruder. Controleer" +" of er niets vastzit in de PTFE-buis. Controleer of de sensor goed leest." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -756,36 +755,37 @@ msgid "Filament used" msgstr "Gebruikte filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Bestand onvolledig. Toch doorgaan?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Voortgang afwerken" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Eerste laag kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Ten eerste zullen we de zelftest uitvoeren om de meest voorkomende " "montageproblemen te controleren." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Stromen" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,58 +794,58 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Voorzijde fan?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Voorkant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Fans voor/links" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-Code is voor een ander niveau geslict. Doorgaan?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." msgstr "" -"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. " -"Druk geannuleerd." +"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft." +" Druk geannuleerd." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-Code is voor een ander printertype geslict. Doorgaan?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-Code is voor een ander printertype geslict. Slice het model opniew " "alsjeblieft. Druk geannuleerd." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-Code is voor een nieuwere firmware geslict. Doorgaan?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -854,35 +854,35 @@ msgstr "" "alsjeblieft. Druk geannuleerd." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW Configuratie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Verwarmer/Therm." #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Opwarmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Verwarming uitgeschakeld door veiligheidstimer." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Opwarmen klaar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +893,7 @@ msgstr "" "printen." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +902,9 @@ msgstr "" "installatieproces?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Hoog verm." @@ -915,48 +915,49 @@ msgid "Homing" msgstr "Startpositie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Hotend op 280C! Mondstuk vervangen en aangedraaid volgens specificaties?" +msgstr "" +"Hotend op 280C! Mondstuk vervangen en aangedraaid volgens specificaties?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend fan:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Begin nu met xyz-kalibratie. Het kan tot 24 min. duren." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Begin nu met z-kalibratie." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "SPANROL STARTPOSFOUT" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "SPANROL BEWEGT NIET" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "ONGELDIG TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -965,17 +966,17 @@ msgstr "" "Instellingen - HW Setup - Staalplaten." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Verbetering van het bedijkingspunt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Info scherm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. SD kaart" @@ -985,7 +986,7 @@ msgid "Insert filament" msgstr "Voer filament in" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -993,40 +994,40 @@ msgstr "" "Steek a.u.b. filament (maar niet laden) in de extruder en druk op knop." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Interne runtime fout. Probeer de MMU-eenheid te resetten of de firmware bij " "te werken. Als het probleem aanhoudt, neem dan contact op met support." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Is filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Ligt de staalplaat op het bed?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Laatste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Laatste printfouten" @@ -1036,57 +1037,57 @@ msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Linker hotend fan?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Linkerkant[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Helder waard" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Dim waarde" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Lineaire correctie" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Live Z aanpassen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Laad alle" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Tot tuit laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1096,69 +1097,70 @@ msgid "Loading color" msgstr "Laden kleur" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laden filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Losse riemschijf" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Hard" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NODIG" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware interne fout, reset de MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU REAGEERT NIET" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: Temperatuur herstellen..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU ZELFTEST MISLUKT" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU fout" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU laadfout" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1167,7 +1169,7 @@ msgstr "" "Als het probleem aanhoudt, neem dan contact op met support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1176,23 +1178,23 @@ msgstr "" "probleem aanhoudt, neem dan contact op met support." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 verbonden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnet. comp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Hoofdmenu" @@ -1202,83 +1204,84 @@ msgid "Measured skew" msgstr "Scheefheid" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Referentie hoogte van het kalibratiepunt meten" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Mesh bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Stand" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Moduswijziging bezig..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Meer details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Verplaats X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Verplaats Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Verplaats Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "As verplaatsen" @@ -1289,94 +1292,96 @@ msgid "Moving selector" msgstr "Bewege selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/V" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Nieuwe firmware versie beschikbaar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nee" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Geen SD kaart" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Geen beweging." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Geen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normaal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Niet verbonden" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Draait niet" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Begin met kalibratie tussen de tuit en het bed." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Opwarmen van de tuit voor PLA voor." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Verwijder nu de testprint van staalplaat." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Tuit" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Tuit wisselen" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Tuit d." @@ -1387,84 +1392,84 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Uit" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden " "geladen." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Aan" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Eenmaal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE TERMISCHE FOUT" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kalibratie klaar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibratie" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA opwarmen" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kalib." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA-kalibratie mislukt" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1473,7 +1478,7 @@ msgstr "" "menu Instellingen-> PINDA kalib." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "RIEMSCH. BEWEGT NIET" @@ -1484,13 +1489,13 @@ msgid "Parking selector" msgstr "Parkere selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauze" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Print pauzeren" @@ -1501,16 +1506,17 @@ msgid "Performing cut" msgstr "Voer cut uit" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" "Leg een vel papier onder de tuit tijdens de kalibratie van de eerste 4 " -"punten. Als de tuit het papier beweegt, de printer onmiddellijk uitschakelen." +"punten. Als de tuit het papier beweegt, de printer onmiddellijk " +"uitschakelen." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1519,110 +1525,111 @@ msgstr "" "wizard door de printer opnieuw te starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" -"AUB IR sensor ver- binding kontrolleren , verwijder filament indien aanwezig." +"AUB IR sensor ver- binding kontrolleren , verwijder filament indien " +"aanwezig." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Controleer aub:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Maak het bed schoon en druk op de knop." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Reinig de tuit voor de kalibratie. Druk op de knop wanneer gereed." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Steek a.u.b. filament in de extruder en druk op de knop om het te laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Steek a.u.b. filament in de eerste buis van de MMU en druk op de knop om het " -"te laden." +"Steek a.u.b. filament in de eerste buis van de MMU en druk op de knop om het" +" te laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Laad a.u.b. eerst filament." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Open spanrol en verwijder filament handmatig." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Leg staalplaat op bed." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Druk op de knop om filament te verwijderen" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Trek onmiddellijk de filament eruit" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Verwijder eerst de transport beschermers." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Verwijder staalplaat van het bed." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Voer eerst de XYZ-kalibratie uit." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Verwijder eerst het filament en probeer het opnieuw." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Voer een upgrade uit" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Even geduld aub" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Stroomstoringen" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Voorverwarmen" @@ -1632,28 +1639,28 @@ msgid "Preheat the nozzle!" msgstr "Tuit voorverwarmen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Opwarmen van de tuit. Wacht aub." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Opwarm. te snijden" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Opwarm.te uitwerpen" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Opwarmen invoeren" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Opwarmen uitwerpen" @@ -1664,33 +1671,33 @@ msgid "Preparing blade" msgstr "Bereid mes voor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Druk op knop" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Druk op de knop om de tuit voor te verwarmen en door te gaan." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Print afgebroken" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Print fan:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Print van SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Print pauzeren" @@ -1700,36 +1707,35 @@ msgid "Print time" msgstr "Print tijd" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Printer IP-adres:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Printer is nog niet gekalibreerd. Volg de handleiding, hoofdstuk First " "steps, sectie Calibration flow." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" -msgstr "" -"Tuitdiameter wijkt af van de G-code. Doorgaan?" +msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "De diameter van de tuit van de printer verschilt van de G-code. Controleer " "de waarde in de instellingen. Afdrukken geannuleerd." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Riemschijf motor is vastgelopen. Controleer of de poelie kan bewegen en " @@ -1742,38 +1748,38 @@ msgid "Pushing filament" msgstr "Duwe filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "QUEUE VOL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Achterkant[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Print herstellen" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Hernoem" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1782,29 +1788,24 @@ msgstr "" "de G-code voor filament index buiten bereik (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Print hervatten" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Hervatten print" @@ -1815,7 +1816,7 @@ msgid "Retract from FINDA" msgstr "Intrekken van FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Retry" @@ -1831,87 +1832,82 @@ msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Recht.kant[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" msgstr "" -"Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint " -"vanaf het begin. Doorgaan?" +"Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint" +" vanaf het begin. Doorgaan?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD kaart" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR STARTP_FOUT" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR BEWEG FOUT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "GESTOPT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Zoeken bed kalibratiepunt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Selecteer" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" -"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in " -"het schermmenu." - -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Kies extruder:" +"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in" +" het schermmenu." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Kies filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Kies taal" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw " "materiaal." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Selecteer de temperatuur die overeenkomt met uw materiaal." @@ -1922,58 +1918,58 @@ msgid "Selecting fil. slot" msgstr "Selectere fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Zelftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Zelftest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Zelftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Zelftest fout!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Zelftest mislukt" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Zelftest zal worden uitgevoerd om nauwkeurige sensorloze auto positie te " "kalibreren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Sensor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensor geverifieerd, verwijder nu het filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Temp. instellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Instellingen" @@ -1983,13 +1979,13 @@ msgid "Severe skew" msgstr "Erg scheef" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Staalplaat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -2002,13 +1998,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Toon endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Stil" @@ -2018,7 +2014,7 @@ msgid "Slight skew" msgstr "Beetje scheef" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2027,172 +2023,165 @@ msgstr "" "per map 100 is." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Er is een probleem opgetreden, Z-kalibratie afgedwongen ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Bestanden sorteren" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Geluid" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Snelheid" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Draait" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "En stabiele 21-26C omgevingstemperatuur is nodig,een stevige stand is " "vereist." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistieken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Stil" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Staalplaten" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Print stoppen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Gewisseld" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC FOUT" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC KORTSLUITING" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVERHITTINGSFOUT" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ONDERVOLT. FOUT" #. 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 "Thermo model kal. duurt ongeveer 12 min. Zie\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Thermo model kal. duurt ongeveer 12 min. Zie\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Thermo model nog ongekalibreerd." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatuur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Teste filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Het spanrol kan niet goed bewegen. Controleer of er iets de beweging " "blokkeert." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"De MMU meldt dat zijn FW-versie niet compatibel is met de firmware van de " -"printer. Controleer of de MMU-firmware up-to-date is." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2200,7 +2189,7 @@ msgstr "" "zit." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2211,7 +2200,7 @@ msgstr "" "(Calibration chapter)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2220,24 +2209,24 @@ msgstr "" "handleiding, hoofdstuk First steps, section Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Tijd" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Time-out" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Totaal" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Totaal fouten" @@ -2252,39 +2241,30 @@ msgid "Total print time" msgstr "Totaal printtijd" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Fijnafstemming" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "ONTLAAD MANUEEL" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Onverwachte FINDA-aflezing. Zorg ervoor dat er geen filament onder FINDA zit " -"en dat de selecteur vrij is. Controleer de FINDA-verbinding." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Ontla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Fil. uitwerpen" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Uitwerpen filament" @@ -2301,23 +2281,23 @@ msgid "Unloading to pulley" msgstr "Ontlade n. riemschi." #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verificatie mislukt, verwijder het filament en probeer het opnieuw." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Spanning" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "WAARSCH. TMC TE HEET" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2330,121 +2310,120 @@ msgstr "" "Stealth stand" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Wacht op gebruiker.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Wachten op afkoelen van PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Wachten op afkoelen van tuit en bed" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Waarsch." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "" "Waarschuwing: zowel het printertype als het moederbordtype is gewijzigd." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Waarschuwing: type moederbord gewijzigd." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Waarschuwing: printertype gewijzigd." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Is filament succes- vol verwijderd?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Aansluitingsfout" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-correctie:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ kal. details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ-kalibratie in orde. Scheefheid zal automatisch worden gecorrigeerd." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibratie in orde. X / Y-assen zijn licht scheef. Goed gedaan!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibratie niet gelukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibratie niet gelukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibratie mislukt. Raadpleeg de handleiding aub." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibratie ok. X / Y-assen staan loodrecht. Gefeliciteerd!" @@ -2454,34 +2433,34 @@ msgid "Y distance from min" msgstr "Y afstand van min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-correctie:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "U kunt de wizard altijd hervatten via Kalibratie -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-correctie:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-test nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] punt offset" @@ -2491,38 +2470,122 @@ msgid "and press the knob" msgstr "en druk op knop" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "om filament te laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "om fil. uitwerpen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "onbekend" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "Status onbekend" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Refresh" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU stroomstor." + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Kies extruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "De MMU meldt dat zijn FW-versie niet compatibel is met de firmware van de " +#~ "printer. Controleer of de MMU-firmware up-to-date is." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Onverwachte FINDA-aflezing. Zorg ervoor dat er geen filament onder FINDA zit" +#~ " en dat de selecteur vrij is. Controleer de FINDA-verbinding." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2545,8 +2608,7 @@ msgstr "🔃Refresh" #~ msgstr "FS 0.4 of nieuwer" #~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "" -#~ "Los het probleem op en druk vervolgens op de knop op de MMU-eenheid." +#~ msgstr "Los het probleem op en druk vervolgens op de knop op de MMU-eenheid." #~ msgid "Load all" #~ msgstr "Laad alle" @@ -2578,9 +2640,6 @@ msgstr "🔃Refresh" #~ msgid "MMU needs user attention." #~ msgstr "MMU heeft gebruikersaandacht nodig." -#~ msgid "MMU power fails" -#~ msgstr "MMU stroomstor." - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Trek onmiddellijk filament eruit en druk vervolgens op de knop." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 56c6169c3..c8171984e 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -11,94 +11,93 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 eller eldre" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 eller nyere" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s nivå ventet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Justerer Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Alt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Alt klart. God printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Omgivelse" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Er venstre og høyre Z-vogn helt oppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Hjelp" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto hjem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Autostyrke" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "AutoLast filament" @@ -116,53 +115,53 @@ msgid "Avoiding grind" msgstr "Unngår sliping" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Akse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Akselengde" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Tilbake" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Seng" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Sengen varmes" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Seng ferdig" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Plankorrekt seng" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -171,55 +170,55 @@ msgstr "" "omstart." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Seng/Varmer" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Beltestatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Belte test" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Oppdaget Strømbrudd! Gjenoppta print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Lys" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Lysstyrke" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKASJONSFEIL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,60 +227,61 @@ msgstr "" "Deretter trykk." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibrer Z. Roter valghjulet for å bevege Z-aksen til toppstoppene. Deretter " -"trykk." +"Kalibrer Z. Roter valghjulet for å bevege Z-aksen til toppstoppene. Deretter" +" trykk." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibrerer hjem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibrering ferdig" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Kan ikke flytte velger eller tomgangshjul" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Kan ikke utføre handling, filamentet er allerede lasted. Avless det først." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Kort fjernet" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Bytt SD kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Bytt filament" @@ -296,55 +296,55 @@ msgid "Changed correctly?" msgstr "Byttet riktig?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Sjekker X aksen" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Sjekker Y aksen" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Sjekker Z aksen" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Sjekker seng" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Sjekker endesensorer" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Sjekker fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Sjekker hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Sjekker sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "G-code sjekk" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Fjern TM-feil" @@ -354,12 +354,12 @@ msgid "Color not correct" msgstr "Farge ikke riktig" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Community laget" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Fort." @@ -369,31 +369,31 @@ msgid "Cooldown" msgstr "Nedkjøling" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kopiere det valgte språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Krasj" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Krasjdetek." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Krasj oppdaget." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,34 +404,34 @@ msgstr "" "Normal modus" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Kutt filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Kutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Dato:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Svak" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Deaktiver" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Frigjør motorer" @@ -443,18 +443,18 @@ msgid "Disengaging idler" msgstr "Frigjør tomgangshjul" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Avstand mellom tuppen av dysen og senga er ikke kalibrert. Vennligst se " "manualen, under First Steps, for hvordan det første laget skal kalibreres." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -463,12 +463,12 @@ msgstr "" "platen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Ferdig" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-korreksjon:" @@ -502,8 +502,8 @@ msgid "ERROR:" msgstr "FEIL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Løs ut fra MMU" @@ -515,17 +515,17 @@ msgid "Ejecting filament" msgstr "Mater ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Endesensor" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Traff ikke endesens." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Endesensorer" @@ -537,47 +537,45 @@ msgid "Engaging idler" msgstr "Aktiverer tomgangsh." #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Ekstruderinfo" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autolast" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F. kork føle" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. Løput" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT ALLEREDE LA" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA IKKE UTLØST" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -586,7 +584,7 @@ msgstr "" "Sikre at filamentet kan beveges og FINDA fungerer." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -595,67 +593,67 @@ msgstr "" "beveges og FINDA fungerer." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. FAST" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS aksjon" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR IKKE TIRGG." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR FOR TIDLIG" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL FAST" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEIL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Feilstatistikk" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Feil stat. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falskt utløsning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Viftehastighet" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Viftetest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Viftesjekk" @@ -684,22 +682,23 @@ msgid "Feeding to nozzle" msgstr "Mater til dyse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Tomt filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -715,14 +714,14 @@ msgid "Filament not loaded" msgstr "Fil. ikke lastet" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Filamentsensor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -731,7 +730,7 @@ msgstr "" "filamentet kan beveges og sensoren fungerer." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -740,7 +739,7 @@ msgstr "" "filamentet rekker fsensor og at sensoren fungerer." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -754,34 +753,35 @@ msgid "Filament used" msgstr "Brukt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Fil er ukomplett. Fortsette allikevel?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Avslutter bevegelser" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Førstelagskal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Først skal jeg kjøre en selvtest for å sjekke vanlige byggefeil." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flyt" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -790,28 +790,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Fremre printvifte?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Fremsiden [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Fremre/venstre vifte" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code sliced for en annen høyde. Fortsette?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -819,63 +819,64 @@ msgstr "" "G-code sliced for en annen høyde. Vennligst slice igjen. Print avbrutt." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code sliced for en annen printer. Fortsette?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code sliced for en annen printer. Vennligst slice igjen. Print avbrutt." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code sliced for nyere fastvare. Fortsette?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" -"G-code sliced for nyere fastvare. Vennligst oppdater systemet. Print avbrutt." +"G-code sliced for nyere fastvare. Vennligst oppdater systemet. Print " +"avbrutt." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "GW oppsett" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Varmer/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Varmer opp" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Varme skrudd av pga. sikkerhet." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Oppvarming ferdig." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -885,7 +886,7 @@ msgstr "" "oppsett, hvor Z aksen blir kalibrert. Du er da klar til å printe." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -894,9 +895,9 @@ msgstr "" "gjennom oppsettprosessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Høy styrke" @@ -907,48 +908,48 @@ msgid "Homing" msgstr "Søker" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend på 280C! Dyse byttet og strammet til spesifikasjonene?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend-vifte:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nå skal jeg kjøre kalibreringen. Det kan ta opptil 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Nå kjører jeg Z-kalibreringen." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER CANNOT HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "IDLER CANNOT MOVE" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "UGYLDIG VERKTØY" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -957,17 +958,17 @@ msgstr "" "Stålplater." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Forbedrer seng kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Infoskjerm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. SD kort" @@ -977,47 +978,47 @@ msgid "Insert filament" msgstr "Sett inn filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "Sett inn filamentet i ekstruderen og deretter trykk inn valghjulet." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Intern runtime feil. Prøv omstart av MMU enheten eller oppdater fastvaren. " "Hvis feilen vedvarer, kontakt kundestøtte." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Er filament lastet?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Er stålplaten på varmesenga?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iterasjon" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Siste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Siste printfeil" @@ -1027,57 +1028,57 @@ msgid "Left" msgstr "Venstre" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Venst. hotendvifte?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Vens. side[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Nivå Lyst" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Nivå Dimmet" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Lin. korreksjon" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Juster Live-Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Last Alle" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Last inn filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Last til dysen" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1087,69 +1088,70 @@ msgid "Loading color" msgstr "Laster farge" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laster filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Løs reim" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Høyt" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FV OPPDAT. NØDVE" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU fastvare intern feil, vennligst nullstill MMU-en." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU Mod." #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU SVARER IKKE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: gjenoppretter temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SELVTEST FEILET" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU feil" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU lastefeil" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1158,7 +1160,7 @@ msgstr "" "vedvarer, kontakt støtte" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1167,23 +1169,23 @@ msgstr "" "vedvarer, kontakt støtte" #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 tilkoblet" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnet komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Hovedmeny" @@ -1193,83 +1195,84 @@ msgid "Measured skew" msgstr "Målt skjevhet" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Måler referansehøyde for kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Plan-nett" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Sengeplanering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Modus endres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Flere detaljer online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Beveg X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Beveg Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Beveg Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Beveg akse" @@ -1280,94 +1283,96 @@ msgid "Moving selector" msgstr "Flytter velger" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr " -" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Ny fastvare tilgjengelig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nei" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "SD-kort mangler" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Ingen bevegelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Ikke tilkoblet" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Spinner ikke" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jeg vil nå kalibrere avstanden mellom tuppen av dysen og varmeplaten." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Jeg vil nå forvarme dysen for PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Fjern nå testprintet fra stålplaten." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Dyse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Dysebytte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Dyse diam." @@ -1378,83 +1383,83 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Av" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Gamle verdier funnet Standarinnstillinger for PID, Esteg etc. blir satt." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "En gang" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSET THERMISK FEIL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kal. ferdig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA varmes" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA kalibrering mislyktes" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1463,7 +1468,7 @@ msgstr "" "under Innstillinger -> PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "REIM UBEVEGELIG" @@ -1474,13 +1479,13 @@ msgid "Parking selector" msgstr "Parkerer velger" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pause printjobben" @@ -1491,7 +1496,7 @@ msgid "Performing cut" msgstr "Utfører kutt" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1500,7 +1505,7 @@ msgstr "" "dysen tar papiret, skru umiddelbart av printeren." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1509,108 +1514,110 @@ msgstr "" "omstarte printeren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Vennligst sjekk koblingen til IR sensorer. Last ut filament om lastet." +msgstr "" +"Vennligst sjekk koblingen til IR sensorer. Last ut filament om lastet." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Venligst sjekk:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Rengjør stålplaten og trykk valghjulet." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengjør dysen og trykk valghjulet." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Sett inn filament I ekstruderen og trykk valghjulet for å laste." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Sett inn filament i det første røret bak MMU-enheten og trykk valghjulet for " -"å laste." +"Sett inn filament i det første røret bak MMU-enheten og trykk valghjulet for" +" å laste." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Vennligst sett inn filament først." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Åpne taljedøren og fjern filamentet for hånd." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Plasser stålplaten på varmesenga." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Trykk valghjulet for å ta ut filamentet" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Trekk ut filamented med en gang" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Vennligst fjern sendingsbeskyttelsen først." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Vennligst ta stålplaten av varmesenga." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Vennligst fullfør XYZ kalibreringen først." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." -msgstr "Vennligst last ut filamentet først, deretter repeter denne handlingen." +msgstr "" +"Vennligst last ut filamentet først, deretter repeter denne handlingen." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Vennligst oppdater." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Vennligst vent" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Strømfeil" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Forvarming" @@ -1620,28 +1627,28 @@ msgid "Preheat the nozzle!" msgstr "Forvarm dysen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Forvarmer dysen. Vennligst vent..." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Forvarmer for kutt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Forvarmer for utmat." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Forvarmer for last" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Forvarmer for fil." @@ -1652,33 +1659,33 @@ msgid "Preparing blade" msgstr "Forbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Trykk valghjulet" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Trykk valghjulet for å forvarme dysen og fortsette." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Print avbrutt" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Printvifte:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Print fra SD-kort" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Print satt på pause" @@ -1688,33 +1695,34 @@ msgid "Print time" msgstr "Printetid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Printer IP adr.:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." -msgstr "Printeren er ikke kalibrert. Vennligst se manualen, under First Steps." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." +msgstr "" +"Printeren er ikke kalibrert. Vennligst se manualen, under First Steps." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " "hva som er satt. Print avbrutt." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "Reimmotor stanset. Sjekk at Reimen kan beveges og sjekk koblinger" @@ -1725,68 +1733,63 @@ msgid "Pushing filament" msgstr "Dytter filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "FULL KØ" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Baksiden [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Gjenopptar print" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Gi nytt navn" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"Forespurt filamentverktøy er ikke tilgjengelig på denne maskinvaren. Sjekk g-" -"code for verktøys-inteks ut av rekkevidde (T0-T4)" +"Forespurt filamentverktøy er ikke tilgjengelig på denne maskinvaren. Sjekk " +"g-code for verktøys-inteks ut av rekkevidde (T0-T4)" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Nullstill" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Nullstill XYZ kal." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Gjenoppta print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Gjenopptar print" @@ -1797,7 +1800,7 @@ msgid "Retract from FINDA" msgstr "ta tilbake fra FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Retry" @@ -1813,12 +1816,12 @@ msgid "Right" msgstr "Høyre" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Høyre side[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1827,69 +1830,64 @@ msgstr "" "begynne på nytt. Fortsette?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD-kort" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "VELGER KAN IKKE HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR STÅR FAST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "STOPPET." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Søker etter kalibreringspunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Velg" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Velg filamenttype for Førstelags- kalibrering." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Velg ekstruder:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Velg filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Velg språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Velg dysetemperatur som passer ditt materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Velg temperaturen som passer ditt materiale." @@ -1900,57 +1898,57 @@ msgid "Selecting fil. slot" msgstr "Velger fil. spor" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Selvtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Selvtest starter" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selvtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Selvtest feil!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Selvtest feilet" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Selvtest vil bli kjørt for å kalibrere nøyaktig sensorløs hjemposisjon." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Sensorinformasjon" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifiserte, fjern filamentet nå." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Satt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Innstillinger" @@ -1960,13 +1958,13 @@ msgid "Severe skew" msgstr "Stor skjevhet" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Plate" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,13 +1977,13 @@ msgstr "" "%cNullstill" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Vis endesensorer" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Lydløs" @@ -1995,183 +1993,177 @@ msgid "Slight skew" msgstr "Lett skjevhet" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." msgstr "Noen filer vil ikke bli sortert. Maks antall filer i en mappe er 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problem møtt. Z aksjeplanering tvunget ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sorter" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sorter filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Lyd" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Hastighet" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Spinner" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "En stabil rom- temperatur på 21-26C og et solid underlag er nødvendig." +msgstr "" +"En stabil rom- temperatur på 21-26C og et solid underlag er nødvendig." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistikk" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Stille" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Stål plate" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Stopp printjobb" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Streng" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "System info" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Byttet" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "THERMISK ANOMALI" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER FEIL" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER NULLSTILL" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER KORTSLUTT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVEROPPHETING" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC LAVSPENNING FEIL" #. 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 "Termisk modell kal. tar omtrent 12 min. Se\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Termisk modell kal. tar omtrent 12 min. Se\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Termisk modell ikke kalibrert enda." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Tester filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Idleren kan ikke gå hjem riktig. sjekk om noe står i veien for bevegelsen." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"MMU enheten raporterer at fastvareversjonen ikke er kompatibel med " -"printerens fastvare. Vær sikker på at MMU fastvaren er oppdatert." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" "Velgeren kan ikke gå hjem riktig. sjekk om noe står i veien for bevegelsen." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2182,7 +2174,7 @@ msgstr "" "skal se ut." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2191,24 +2183,24 @@ msgstr "" "hovedmenyen og følg Veilederen." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Dato" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Tidsavbrudd" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Totalt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Feil totalt" @@ -2223,39 +2215,30 @@ msgid "Total print time" msgstr "Printetid totalt" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Juster" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "LAST UT MANUELT" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Uventet FINDA avlesning. Sjekk at det ikke er filament under FINDA og at " -"selektoren er fri. Sjekk FINDA tilkobling." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Last ut" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Last ut filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Laster ut filament" @@ -2272,23 +2255,23 @@ msgid "Unloading to pulley" msgstr "Utlaster til trinse" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifisering feilet. Fjern filamentet og prøv igjen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Strøm/Volt" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "VARSEL TMC FOR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2301,118 +2284,117 @@ msgstr "" "Stillemodus" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Venter på bruker..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Venter på PINDA nedkjøling" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Venter på dyse- og platenedkjøling" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Advarsel" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Advarsel: Både printertype og hovedkortype er forandret." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Advarsel: Hovedkortype forandret." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Advarsel: Printertype forandret." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Ble filamentet lastet helt ut?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Koblingsfeil" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Veileder" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-korreksjon:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ cal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibreringen er grei. Skjevhet blir justert automatisk." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibreringen er god. Godt jobba!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ kalibreringen feilet. Kalibreringspunkt ikke funnet." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kal. mislyktes. Vennligst rådfør med håndboken." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "XYZ kalibrering OK.\n" @@ -2424,34 +2406,34 @@ msgid "Y distance from min" msgstr "Y distanse fra min." #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-korreksjon:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid starte Veilederen fra Kalibrering -> Veileder." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-korreksjon:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] punktforskyv." @@ -2461,38 +2443,122 @@ msgid "and press the knob" msgstr "og trykk på knappen" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "for filamentlast" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "for filament ut" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "ukjent" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "ukjent tilstand" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Forfriske" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU strøm feil" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Velg ekstruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU enheten raporterer at fastvareversjonen ikke er kompatibel med " +#~ "printerens fastvare. Vær sikker på at MMU fastvaren er oppdatert." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Uventet FINDA avlesning. Sjekk at det ikke er filament under FINDA og at " +#~ "selektoren er fri. Sjekk FINDA tilkobling." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2546,9 +2612,6 @@ msgstr "🔃Forfriske" #~ msgid "MMU needs user attention." #~ msgstr "MMU trenger brukerinnvending." -#~ msgid "MMU power fails" -#~ msgstr "MMU strøm feil" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Fjern filamentet og trykk valghjulet." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 25ca22143..121130e5d 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -16,89 +16,88 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 ../../Firmware/Filament_sensor.cpp:366 -#: ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:289 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 lub starszy" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 ../../Firmware/Filament_sensor.cpp:369 -#: ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:291 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "Oczekiwano wersji %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Anuluj" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Ustawianie Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Wszystko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfab" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Zawsze" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Otoczenie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Asyst." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto zerowanie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Automatycz" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autoladowanie fil." @@ -106,7 +105,8 @@ msgstr "Autoladowanie fil." #: ../../Firmware/ultralcd.cpp:2294 msgid "" "Autoloading filament is active, just press the knob and insert filament..." -msgstr "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." +msgstr "" +"Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." #. MSG_PROGRESS_AVOID_GRIND c=20 #: ../../Firmware/mmu2_progress_converter.cpp:16 @@ -115,53 +115,53 @@ msgid "Avoiding grind" msgstr "Unikaj scierania" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Dlugosc osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Wstecz" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Stol" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Grzanie stolu" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Stol OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Korekta stolu" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,55 +170,55 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Stol/Grzanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Stan paskow" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test paskow" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia.Kontynowac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Jasnosc" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "BLAD KOMUNIKACJI" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibruj Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,60 +227,61 @@ msgstr "" "ogranicznikow. Nacisnij, by potwierdzic." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibruje Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" -"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. " -"Click when done." +"Calibrating Z. Rotate the knob to move the Z carriage up to the end " +"stoppers. Click when done." msgstr "" "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych " "ogranicznikow. Nacisnij, by potwierdzic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Zerowanie osi" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibracja" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibracja OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Nie mozna poruszyc wybieraka lub docisku" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Nie mozna wykonac akcji, filament jest juz zaladowany. Rozladuj go najpierw." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Karta wyjeta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Zmiana karty SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Wymiana filamentu" @@ -295,55 +296,55 @@ msgid "Changed correctly?" msgstr "Wymiana ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Kontrola stolu" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Kontrola krancowek" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Sprawdzanie pliku" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Kontrola hotendu" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Kontrola czujnikow" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Testy" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Wyczyść błąd TM" @@ -353,12 +354,12 @@ msgid "Color not correct" msgstr "Kolor zanieczysz." #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Od spolecznosci" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Kont." @@ -368,31 +369,31 @@ msgid "Cooldown" msgstr "Chlodzenie" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Zderzen" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Wykr.zderzen" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Zderzenie wykryte" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,34 +405,34 @@ msgstr "" "trybie Normalnym" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Ciecie filamentu" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Nozyk" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Sciemn" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Wylacz" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -443,17 +444,18 @@ msgid "Disengaging idler" msgstr "Zwalnianie docisku" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer calibration." +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " +"calibration." msgstr "" -"Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z " -"instrukcja: rozdzial Wprowadzenie." +"Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie" +" z instrukcja: rozdzial Wprowadzenie." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -462,12 +464,12 @@ msgstr "" "stolikiem?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Wyk." #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Korekcja-E:" @@ -501,8 +503,8 @@ msgid "ERROR:" msgstr "BLAD:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Wysun z MMU" @@ -514,17 +516,17 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Krancowka" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Krancowki" @@ -536,125 +538,124 @@ msgid "Engaging idler" msgstr "Urucham. docisku" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Ekstruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "Autolad. fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "Zaciecie fil." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "Koniec fil." #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT JUZ ZALAD." #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NIE WLACZONA" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA nie wylaczyla sie podczas rozlad-owywania filamentu. Sprobuj rozladowac " -"recznie. Sprawdz, czy filament moze sie poruszac i czy FINDA dziala." +"FINDA nie wylaczyla sie podczas rozlad-owywania filamentu. Sprobuj " +"rozladowac recznie. Sprawdz, czy filament moze sie poruszac i czy FINDA " +"dziala." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" -"FINDA didn't trigger while loading the filament. Ensure the filament can move " -"and FINDA works." +"FINDA didn't trigger while loading the filament. Ensure the filament can " +"move and FINDA works." msgstr "" -"FINDA nie uruchamia sie podczas ladowania filamentu. Upewnij sie, ze filament " -"moze sie poruszac i FINDA dziala." +"FINDA nie uruchamia sie podczas ladowania filamentu. Upewnij sie, ze " +"filament moze sie poruszac i FINDA dziala." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. ZABLOK." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "Akcja FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NIE WLACZ." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR ZBYT WCZESN." #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL. ZABLOK" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "BLAD DZIALANIA FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Statystyki bledow" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Bledy MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falszywy alarm" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Predkosc went." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test wentylatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Sprawd.went." @@ -683,22 +684,23 @@ msgid "Feeding to nozzle" msgstr "Podaw. do dyszy" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Konc.filamentu" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Czuj. filam." #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -714,38 +716,38 @@ msgid "Filament not loaded" msgstr "Fil. nie zaladowany" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Czujnik filamentu" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Czujnik filamentu nie wylaczyl sie podczas rozladowywania filamentu. Sprawdz, " -"czy filament moze sie poruszac i czy czujnik dziala." +"Czujnik filamentu nie wylaczyl sie podczas rozladowywania filamentu. " +"Sprawdz, czy filament moze sie poruszac i czy czujnik dziala." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the filament " -"reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the " +"filament reached the fsensor and the sensor works." msgstr "" "Czujnik filamentu nie zadzialal podczas ladowania filamentu. Sprawdz, czy " "filament dotarl do czujnika i czy czujnik dziala." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Cz. filam. zadzialal zbyt wczesnie podcz. ladowania do ekstr. Sprawdz czy nic " -"nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." +"Cz. filam. zadzialal zbyt wczesnie podcz. ladowania do ekstr. Sprawdz czy " +"nic nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -753,36 +755,37 @@ msgid "Filament used" msgstr "Uzyty filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Konczenie druku" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Kal. 1. warstwy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas " "montazu." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Przeplyw" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,100 +794,102 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Przedni went. druku?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Przod [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Przedni/lewy wentyl." -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code pociety dla innej wersji. Kontynuowac?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." -msgstr "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." +msgstr "" +"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code pociety dla innej drukarki. Kontynuowac?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" -"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." +"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk " +"anulowany." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code pociety dla nowszego FW. Kontynuowac?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "G-code pociety dla nowszego FW. Zaktualizuj FW. Druk anulowany." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "Ustawienia HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Grzanie..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Grzanie zakonczone" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " -"setup process, in which the Z-axis will be calibrated. Then, you will be ready " -"to print." +"setup process, in which the Z-axis will be calibrated. Then, you will be " +"ready to print." msgstr "" -"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka " -"kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." +"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez " +"krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -893,9 +898,9 @@ msgstr "" "ustawieniem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Wysoka wyd" @@ -906,67 +911,68 @@ msgid "Homing" msgstr "Bazowanie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Hotend rozgrzany do 280°C! Dysza wymieniona i dokręcona wg 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:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Went. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie to do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "DOCISK NIE BAZUJE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "DOCISK NIE RUSZA SIE" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "BLEDNE NARZEDZIE" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" -"If you have additional steel sheets, calibrate their presets in Settings - HW " -"Setup - Steel sheets." +"If you have additional steel sheets, calibrate their presets in Settings - " +"HW Setup - Steel sheets." msgstr "" "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu " "Ustawienia - Ustawienia HW - Plyty stalowe." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Poprawa punktu kalibracji stolu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Ekran informacyjny" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Inic. karty SD" @@ -976,47 +982,49 @@ msgid "Insert filament" msgstr "Wprowadz filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" -"Insert the filament (do not load it) into the extruder and then press the knob." +"Insert the filament (do not load it) into the extruder and then press the " +"knob." msgstr "" -"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." +"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij " +"pokretlo." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW. Skontaktuj sie z " "pomoca techniczna, jeśli problem nadal występuje." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteracja" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Ost. wydruk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Ostatnie bledy druku" @@ -1026,57 +1034,57 @@ msgid "Left" msgstr "Lewa" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Lewo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Poziom jasn." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Poziom ciem." #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Korekcja liniowa" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Ustaw. Live Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Zalad. wszystkie" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Ladowanie fil." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1086,103 +1094,104 @@ msgid "Loading color" msgstr "Czyszcz. koloru" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 -#: ../../Firmware/mmu2_progress_converter.cpp:51 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/mmu2_progress_converter.cpp:51 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laduje filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Luzne kolo pasowe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Glosny" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW WYMAGA AKTUAL" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Blad wewnetrzny MMU FW, zresetuj MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "Tryb MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NIE ODPOWIADA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU wznaw. Nagrzewanie..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU BLAD SELFTEST" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Bledy MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Bledy lad. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU nie dziala. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje, " -"skontaktuj sie z pomoca techniczna." +"MMU nie dziala. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje," +" skontaktuj sie z pomoca techniczna." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje, " -"skontaktuj sie z pomoca techniczna." +"MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal " +"wystepuje, skontaktuj sie z pomoca techniczna." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU podlaczone" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Kor. magnesow" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Menu glowne" @@ -1192,83 +1201,84 @@ msgid "Measured skew" msgstr "Zmierz. skos" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Siatka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Tryb" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Trwa zmiana trybu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Więcej szczegółów online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Silnik" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Ruch osi X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Ruch osi Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Ruch osi Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Ruch osi" @@ -1279,94 +1289,96 @@ msgid "Moving selector" msgstr "Ruch wybieraka" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/D" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Dostepna nowa wersja FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Brak karty SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Brak ruchu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Brak" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nie podlaczono" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Nie kreci sie" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Kalibruje odleglosc miedzy koncowka dyszy a powierzchnia druku." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Dysza" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Wymiana dyszy" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Sr. dyszy" @@ -1377,93 +1389,93 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Wyl" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, " "itp." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Wl" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "1-raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUZA BLAD TERMICZNY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "Kalibracja PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "Kalibracja PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "Kalib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Kalibracja temperaturowa nieudana" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" -"PINDA calibration is finished and active. It can be disabled in menu Settings-" -">PINDA cal." +"PINDA calibration is finished and active. It can be disabled in menu " +"Settings->PINDA cal." msgstr "" -"Kalibracja PINDA zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -" -"> Kalib. PINDA" +"Kalibracja PINDA zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia" +" -> Kalib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "RADELKO NIE RUSZA" @@ -1474,13 +1486,13 @@ msgid "Parking selector" msgstr "Parkowanie wybieraka" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Wstrzym. wydruku" @@ -1491,7 +1503,7 @@ msgid "Performing cut" msgstr "Odcinanie" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1500,7 +1512,7 @@ msgstr "" "punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1509,107 +1521,108 @@ msgstr "" "Asystenta przez restart drukarki." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Sprawdz:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 -msgid "Please insert filament into the extruder, then press the knob to load it." +#: ../../Firmware/ultralcd.cpp:3795 +msgid "" +"Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" -"Please insert filament into the first tube of the MMU, then press the knob to " -"load it." +"Please insert filament into the first tube of the MMU, then press the knob " +"to load it." msgstr "" "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go " "zaladowac." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Umiescic plyte stalowa na stole podgrzewanym." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Zdjac plyte stalowa z podgrzewanego stolu." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Najpierw uruchomic kalibracje XYZ" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Prosze zaktualizowac" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Prosze czekac" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Zaniki zasil." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Grzanie" @@ -1619,28 +1632,28 @@ msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." @@ -1651,33 +1664,33 @@ msgid "Preparing blade" msgstr "Przygot. ostrza" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Wcisnij pokretlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Druk przerwany" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "WentWydruk:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Druk z karty SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Druk wstrzymany" @@ -1687,34 +1700,35 @@ msgid "Print time" msgstr "Czas druku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Adr. IP drukarki:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial " "Pierwsze Kroki." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Srednica dyszy rozni sie od tej w G-code. Kontynuowac?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in settings. " -"Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" -"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." +"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk " +"anulowany." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Silnik kola radelkowanego utknal. Upewnij sie, ze kolo moze sie poruszac i " @@ -1727,68 +1741,63 @@ msgid "Pushing filament" msgstr "Wsuwanie filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "KOLEJKA PELNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Tyl [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Wznawianie wydruku" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Zmien nazwe" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"Zadane narzedzie filamentu nie jest dostepne na tym sprzecie. Sprawdz G-code " -"pod wzgledem indeksu narzedzia poza zakresem (T0-T4)." +"Zadane narzedzie filamentu nie jest dostepne na tym sprzecie. Sprawdz G-code" +" pod wzgledem indeksu narzedzia poza zakresem (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Wznowic wydruk" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Wznawianie druku" @@ -1799,7 +1808,7 @@ msgid "Retract from FINDA" msgstr "Wycof, z FINDY" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Ponow" @@ -1815,12 +1824,12 @@ msgid "Right" msgstr "Prawa" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Prawo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1829,70 +1838,66 @@ msgstr "" "Kontynuowac?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "Karta SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "WYBIERAK NIE BAZUJE" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "WYBIERAK NIE RUSZA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ZATRZYMANO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Szukam punktu kalib. na stole" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Wybierz" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" -"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." - -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Wybierz ekstruder:" +"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu " +"ekranowym." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Wybierz filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Wybor jezyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." @@ -1903,58 +1908,58 @@ msgid "Selecting fil. slot" msgstr "Wybieranie slotu fil" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Selftest startuje" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Blad selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Selftest nieudany" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez " "krancowek" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info o sensorach" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Ustaw temperature:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Ustawienia" @@ -1964,13 +1969,13 @@ msgid "Severe skew" msgstr "Znaczny skos" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Plyta" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1983,13 +1988,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Pokaz krancowki" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Cichy" @@ -1999,135 +2004,136 @@ msgid "Slight skew" msgstr "Lekki skos" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." msgstr "" -"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." +"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = " +"100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sortowanie plikow" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Dzwiek" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Predkosc" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Kreci sie" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." +msgstr "" +"Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statystyki" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Cichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Plyty stalowe" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Przerwanie druku" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Restr." #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Wsparcie" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Zamieniono" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "BLAD STEROW. TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "RESET STEROW. TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "ZWARCIE STEROW. TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "PRZEGRZANIE TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "ZA NIS. NAPIECIE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4054 +#: ../../Firmware/ultralcd.cpp:3965 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2136,89 +2142,80 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Model termicznego nie zostal skalib." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperatury" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Test filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 -msgid "The Idler cannot home properly. Check for anything blocking its movement." +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +msgid "" +"The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Docisk nie moze sie prawidlowo zbazowac. Sprawdz, czy nic nie blokuje jego " "ruchu." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's firmware. " -"Make sure the MMU firmware is up to date." -msgstr "" -"MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW MMU jest " -"aktualne." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" -"Wybeirak nie moze sie prawidlowo zbazowac. Sprawdz, czy nic nie blokuje jego " -"ruchu." +"Wybeirak nie moze sie prawidlowo zbazowac. Sprawdz, czy nic nie blokuje jego" +" ruchu." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " "chapter)." msgstr "" "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna " -"wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial " -"Kalibracja)." +"wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial" +" Kalibracja)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" -"There is still a need to make Z calibration. Please follow the manual, chapter " -"First steps, section Calibration flow." +"There is still a need to make Z calibration. Please follow the manual, " +"chapter First steps, section Calibration flow." msgstr "" -"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze " -"Kroki." +"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze" +" Kroki." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Czas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Wyl. czas." #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Suma" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Suma bledow" @@ -2233,38 +2230,30 @@ msgid "Total print time" msgstr "Laczny czas druku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Strojenie" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "ROZLAD. RECZNIE" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Nieoczekiwany odczyt FINDA. Upewnij sie, ze zaden filament nie znajduje sie " -"pod FINDA, a wybierak jest wolny. Sprawdz polaczenie FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Rozladuj" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Rozladowanie fil" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 -#: ../../Firmware/mmu2_progress_converter.cpp:50 ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/mmu2_progress_converter.cpp:50 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Rozladowuje filament" @@ -2281,23 +2270,23 @@ msgid "Unloading to pulley" msgstr "Rozladow. do radelka" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Napiecia" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "UWAGA TMC ZA GORACY" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2310,121 +2299,122 @@ msgstr "" "trybie Stealth" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Czekam na uzytk. ..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Ostrzez" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Ostrzezenie: typ drukarki i plyta glowna ulegly zmianie." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Blad polaczenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Asystent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Korekcja-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibracja XYZ pomyslna. Skos bedzie automatycznie korygowany." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 -msgid "XYZ calibration compromised. Right front calibration point not reachable." +#: ../../Firmware/ultralcd.cpp:3220 +msgid "" +"XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic " "montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." -msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." +msgstr "" +"Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" -"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz " -"drukarki." +"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic " +"montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" @@ -2434,34 +2424,35 @@ msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Korekcja-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Tak" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +msgstr "" +"Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Korekcja-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Ilosc Pomiarow" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" @@ -2471,38 +2462,122 @@ msgid "and press the knob" msgstr "i nacisnij pokretlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "aby zaladow. fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "aby rozlad. filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "nieznane" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "Stan nieznany" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Odswiezac" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Zaniki zas. MMU" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Wybierz ekstruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW MMU jest " +#~ "aktualne." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Nieoczekiwany odczyt FINDA. Upewnij sie, ze zaden filament nie znajduje sie " +#~ "pod FINDA, a wybierak jest wolny. Sprawdz polaczenie FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2556,9 +2631,6 @@ msgstr "🔃Odswiezac" #~ msgid "MMU needs user attention." #~ msgstr "MMU wymaga uwagi uzytkownika." -#~ msgid "MMU power fails" -#~ msgstr "Zaniki zas. MMU" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Wyciagnij filament i wcisnij pokretlo." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index eee117045..2f2ec152d 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -11,94 +11,93 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 / mai vechi" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 / mai nou" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "nivel %s asteptat" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Anuleaza" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Ajustare Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Totul OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Totul este OK. Distractie placuta!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Mereu" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Ambiental" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Este axa Z aliniata sus?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Put. auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Inc.auto Filament" @@ -117,53 +116,53 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Axa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Lungime axa" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Inapoi" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Pat" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Patul se incalzeste" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Pat incalzit" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Nivelare pat" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -172,55 +171,55 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Incalzitor/Pat" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Status curele" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test curele" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Pana de curent. Continuati printul?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Maxim" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Luminozitate ecran" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "EROARE DE COMUNICARE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Calibrare XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -229,13 +228,13 @@ msgstr "" "butonul cand este gata." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -244,46 +243,47 @@ msgstr "" "butonul cand este gata." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Calibrare home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Calibrare" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Calibrare gata" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Select./Idler blocat" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Nu se poate efectua actiunea, filamentul este incarcat.Descarcati-l mai " "intai." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Card scos" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Schimba card SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Schimba filamentul" @@ -298,55 +298,55 @@ msgid "Changed correctly?" msgstr "Schimbat corect?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Verificare axa X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Verificare axa Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Verificare axa Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Verificare pat" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Verif. endstop-uri" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Verif. fisier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Verificare hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Verificare senzori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Verificari" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Ștergeți eroare TM" @@ -356,12 +356,12 @@ msgid "Color not correct" msgstr "Culoare gresita" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Comunitate" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Cont." @@ -371,31 +371,31 @@ msgid "Cooldown" msgstr "Racire" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Copiaza limba selectata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Coliz." #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Det.coliziune" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Coliziune detectata." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,34 +406,34 @@ msgstr "" "doar in modul normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Taie filamentul" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Cutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Minim" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Dezactiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Oprire steppere" @@ -445,18 +445,18 @@ msgid "Disengaging idler" msgstr "Decuplare idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Distanta dintre varf si pat nu a fost setata. Urmariti instructiunile din " "manual, capitolul First steps, sectiunea First layer calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -465,12 +465,12 @@ msgstr "" "suprafata de print?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Gata" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-correctie:" @@ -504,8 +504,8 @@ msgid "ERROR:" msgstr "EROARE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Scoateți din MMU" @@ -517,17 +517,17 @@ msgid "Ejecting filament" msgstr "Se scoate filamentul" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Endstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Endstop neatins" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Endstop-uri" @@ -539,47 +539,45 @@ msgid "Engaging idler" msgstr "Cuplare idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Info. extruder" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "Autoload fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F. blocaj det" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "Fil. epuizat" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAM. DEJA INCARCAT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NU SA DECLANST" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -588,7 +586,7 @@ msgstr "" "ca FINDA functioneaza." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -597,67 +595,67 @@ msgstr "" "misca si FINDA functioneaza." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCAT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "Actiune FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENZ NU SA DECLASAT" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR PREA DEVREME" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL. BLOCAT" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "Eroare FW RUNTIME" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Statistici erori" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Stat. erori MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "nu detect. schimbare" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Viteza vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventilator" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Verif. vent." @@ -686,22 +684,23 @@ msgid "Feeding to nozzle" msgstr "Incarcare la varf" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Epuizari Fil." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Senzor Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -717,14 +716,14 @@ msgid "Filament not loaded" msgstr "Fil. nu e incarcat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Senz. de filament" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -733,22 +732,22 @@ msgstr "" "filamentul se misca si senzorul functioneaza." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" -"Senzorul de filament nu s-a declansast in timpul incarcarii Fil. Asigurativa " -"ca filamentul a ajuns la fsenzor si senzorul functioneaza." +"Senzorul de filament nu s-a declansast in timpul incarcarii Fil. Asigurativa" +" ca filamentul a ajuns la fsenzor si senzorul functioneaza." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"FSenzor sa declansat prea devreme in timpul incarc. in extrud. Verifica daca " -"nu este nimic blocat in tub-ul PTFE. Verifica daca senz. funct. corect." +"FSenzor sa declansat prea devreme in timpul incarc. in extrud. Verifica daca" +" nu este nimic blocat in tub-ul PTFE. Verifica daca senz. funct. corect." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -756,36 +755,37 @@ msgid "Filament used" msgstr "Filament folosit" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Fisier incomplet. Continua oricum?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Finalizare miscari" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Cal. first layer" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Mai intai, voi rula testele automate pentru a verifica cele mai intalnite " "probleme de asamblare." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,28 +794,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Vent. print?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Fata [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Ventilatoarele sunt" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "Versiune de G-code incorecta. Continuati?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -824,28 +824,28 @@ msgstr "" "anulat." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code pregatit pentru un alt tip de printer. Continuati?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" -"G-code pregatit pentru un alt tip de printer. Va rugam pregatiti modelul din " -"nou. Print anulat." +"G-code pregatit pentru un alt tip de printer. Va rugam pregatiti modelul din" +" nou. Print anulat." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code pregatit pentru firmware mai nou. Continuati?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -854,45 +854,46 @@ msgstr "" "Print anulat." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "Setup HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Incalzitor/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Incalzire" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Incalzirea dezactivata de timer-ul de siguranta" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Incalzirea gata." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " "ready to print." msgstr "" "Salut, sunt imprimanta ta Original Prusa i3. Te voi ghida printr-un scurt " -"proces de setup in care axa Z va fi calibrata. Apoi, vei fi gata sa printezi." +"proces de setup in care axa Z va fi calibrata. Apoi, vei fi gata sa " +"printezi." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -901,9 +902,9 @@ msgstr "" "automate si calibrarile?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Put. max" @@ -914,48 +915,48 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend la 280C! Varf schimbat si strans conf. specificatiei?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Voi rula calibrarea XYZ acum. Va dura până la 24 de min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Voi rula calibrarea Z acum." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER NU REVINE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "IDLER NU SE MISCA" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "Verifica FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "INSTRUMENT INVALID" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -964,17 +965,17 @@ msgstr "" "- Suprafete print." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Imbunatatirea punctului de calibrare al patului" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Ecran informatii" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. card SD" @@ -984,47 +985,47 @@ msgid "Insert filament" msgstr "Incarca filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "Infige filamentul (nu-l incarca) in extruder si apasa butonul." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "ERR de rulare interna. Incercati sa resetati unitatea MMU sau actualizati " "firmwarul. Daca problema persista, contactati dep. support" #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Este filamentul incarcat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Este suprafata de print pe pat?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Ultimul print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Erorile ultim. print" @@ -1034,57 +1035,57 @@ msgid "Left" msgstr "Stanga" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Vent. hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Stanga [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Lum. maxim" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Lum. minim" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Corectie lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Reglare Z live" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Incarca toate" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Incarca filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Incarca la varf" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "Incarcare Test" @@ -1094,69 +1095,70 @@ msgid "Loading color" msgstr "Incarcare culoare" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Incarcare filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Fulie slabita" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Tare" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU UPDATE NECESAR" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Intermal MMU ERR, Va rog resetati MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "Mod MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NU RASPUNDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Restabilirea temperaturii..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST. ESUATA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Erori MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "Err. incarc MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1165,7 +1167,7 @@ msgstr "" "problema persista, contactati dep. support" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1174,23 +1176,23 @@ msgstr "" "persista, contactati dep. support" #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 conectat" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Comp. magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Meniu principal" @@ -1200,83 +1202,84 @@ msgid "Measured skew" msgstr "Distorsiune" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Masurare distanta de referinta pentru punctul de calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Calibrare mesh" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Schimbare mod in progres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Mai multe detalii online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Miscare X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Miscare Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Miscare Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Miscare axe" @@ -1287,94 +1290,96 @@ msgid "Moving selector" msgstr "Miscare selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Vers. de firmware noua disponibila:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nu" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Fara card SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Fara miscare." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "N/A" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nu este conectat" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Nu se roteste" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Acum voi calibra distanta dintre varf si suprafata patului." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Acum voi preincalzi extruder-ul pentru PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Acum inlaturati printul de test de pe suprafata de print." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Varf" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Schimbare varf" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Diam. varf" @@ -1385,82 +1390,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Setari vechi detectate. PID, Esteps etc. de baza vor fi setate." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "O data" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "OPRIT THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "Calibrare PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "Calibrare PID gata" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "Calibrare PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Incalzire PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Calibrarea temperaturii a esuat" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1469,7 +1474,7 @@ msgstr "" "meniul Setari->Cal. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "PULLEY NU SE MISCA" @@ -1480,13 +1485,13 @@ msgid "Parking selector" msgstr "Parcare selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pauza print" @@ -1497,7 +1502,7 @@ msgid "Performing cut" msgstr "Efect. taiere" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1506,7 +1511,7 @@ msgstr "" "Daca varful prinde hartia, opriti imediat imprimanta." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1515,27 +1520,27 @@ msgstr "" "ul repornind imprimanta." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Verificati senzorul IR, scoateti filamentul daca exista." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Verificati:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Curatati patul si apoi apasati butonul pentru a continua." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Curatati varful pentru calibrare. Apasati butonul cand terminati." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1543,7 +1548,7 @@ msgstr "" "incarca." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1552,73 +1557,73 @@ msgstr "" "pentru a-l incarca." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Va rugam incarcati filamentul mai intai." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Deschideti idler-ul si scoateti filamentul manual." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Asezati suprafata de print pe pat." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Apasati butonul pentru a scoate filamentul." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Va rugam scoateti filamentul imediat" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Va rugam scoateti protectiile de transport mai intai." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Va rugam indepartati suprafata de print de pe pat." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Va rugam rulati calibrarea XYZ mai intai." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Va rugam mai intai sa scoateti filamentul, apoi incercati din nou." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Va rugam actualizati" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Va rog asteptati" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Err. alimentare" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Preincalzire" @@ -1628,28 +1633,28 @@ msgid "Preheat the nozzle!" msgstr "Preincalziti varful!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Preincalzire extruder. Asteptati, va rugam." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Preincalz. incarcare" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Preincalz. scoatere" @@ -1660,33 +1665,33 @@ msgid "Preparing blade" msgstr "Pregatire lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Apasati butonul" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Apasati butonul pentru a preincalzi extruder-ul si continuati." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Print anulat" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Vent. print:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Printare de pe SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Print oprit" @@ -1696,35 +1701,35 @@ msgid "Print time" msgstr "Durata print" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "IP imprimanta:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Imprimanta nu a fost calibrata inca. Va rugam sa folositi manualul, " "capitolul First steps, sectiunea Calibration flow." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametrul varfului diferă t de cel din G-code. Continuati?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" -"Diametrul varfului diferă de cel din G-code. Va rugam verificati " -"valoarea in setari. Print anulat." +"Diametrul varfului diferă de cel din G-code. Va rugam verificati valoarea in" +" setari. Print anulat." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motorul Pully sa blocat. Asigurativa ca scripetele se poate misca si " @@ -1737,38 +1742,39 @@ msgid "Pushing filament" msgstr "Introducere filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "QUEUE PLIN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Spate [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Recuperare print" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Scoateti filamentul vechi si apasati butonul pentru a incarca filamentul nou." +"Scoateti filamentul vechi si apasati butonul pentru a incarca filamentul " +"nou." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Redenumeste" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1777,29 +1783,24 @@ msgstr "" "Verifica G-codul ptr indexul instrum. in afara intervalului (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset." -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset. calibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Continua print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Reluare print..." @@ -1810,7 +1811,7 @@ msgid "Retract from FINDA" msgstr "Retract de la FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Retry" @@ -1826,53 +1827,53 @@ msgid "Right" msgstr "Dreapta" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Dreapta [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" msgstr "" -"Rularea Wizard-ului va sterge rezultatele curente ale calibrarii si va porni " -"de la inceput. Continuati?" +"Rularea Wizard-ului va sterge rezultatele curente ale calibrarii si va porni" +" de la inceput. Continuati?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "Card SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR NU REVINE" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR NU SE MISCA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "OPRIT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Se cauta punctele de calibrare" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Selecteaza" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1880,32 +1881,27 @@ msgstr "" "Alegeti un filament pentru First Layer Calibration si selectati-l de pe " "ecran." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Alege extruderul:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Select. filamentul:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Selectati limba" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selectati temperatura de preheat a extruder-ului pentru materialul ales." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Selectati temp. potrivita pentru materialul curent." @@ -1916,57 +1912,57 @@ msgid "Selecting fil. slot" msgstr "Selectare slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Testare automata OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Start Autotestare" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Testare automata" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Err. test. automata!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Autotestare esuata" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Testarea automata va fi rulata pentru a calibra sensorless rehoming-ul." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Info. senzori" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Senzorul a fost verificat, scoate filamentul." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Setati temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Setari" @@ -1976,13 +1972,13 @@ msgid "Severe skew" msgstr "Deform. severa" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Suprafata" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1995,13 +1991,13 @@ msgstr "" "%cReset." #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Stare endstop-uri" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Silent." @@ -2011,7 +2007,7 @@ msgid "Slight skew" msgstr "Dist. usoara" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2020,171 +2016,164 @@ msgstr "" "care pot fi sortate este 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "A fost intalnita o problema, calibrarea Z a fost initiata..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sortare" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sortare fisiere..." #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Sunet" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Viteza" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Se roteste" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Temp. ambient. stabila (21-26C) si o suprafata de lucru rigida necesare." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistici" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Silent." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Suprafete print" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Oprire print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Strict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Informatii" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "inversate" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "ANOMALIE TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "Eroare driver TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "Reset driver TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "DRIVER TMC IN SCURT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "ERR TMC supraincalz." #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR subtensiune TMC" #. 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 "Cal. Model termic dureaza aprox. 12 min. Vezi\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Cal. Model termic dureaza aprox. 12 min. Vezi\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Modelul termic nu este inca calibrat." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturi" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Testare filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Idler-ul nu poate reveni corect. Verificati daca exista ceva care blocheza " "miscarea." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"Versiune FW MMU este incompatibil cu cea a imprimantei. Asigurati-va ca FW " -"MMU este actualizat." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2192,7 +2181,7 @@ msgstr "" "blocheza miscarea." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2202,7 +2191,7 @@ msgstr "" "inaltimea optima. Folositi pozele din handbook (capitolul Calibration)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2211,24 +2200,24 @@ msgstr "" "First steps, sectiunea Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Data" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Total erori" @@ -2243,39 +2232,30 @@ msgid "Total print time" msgstr "Durata totala print" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Optiuni" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "DESCARCARE MANUALA" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Citire FINDA neasteptata. Asig. ca nu este Fil. sub FINDA si selector-ul " -"este liber. Verifica conexiune FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Unload" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Descarca filam." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Scoatere filament" @@ -2292,23 +2272,23 @@ msgid "Unloading to pulley" msgstr "Scoatere la pully" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verificarea a esuat, scoateti filamentul si incercati din nou." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Voltaje" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "TMC SUPRAINCALZIT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2321,93 +2301,92 @@ msgstr "" "modul silentios" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Se asteapta..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Se asteapta racirea probei PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Se ateapta racirea extruder-ului si a patului" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Avert." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Atentie: tipul imprimantei si al placii de baza s-a schimbat." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Atentie: tipul placii de baza s-a schimbat." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Atentie: tipul imprimantei s-a schimbat." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Filamentul a fost scos cu succes?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Eroare de cablare" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Corect. X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "Init XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Detalii cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibrarea XYZ in regula. Distorsiunea va fi corectata automat." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibrarea XYZ in regula. Axele X/Y sunt distorsionate putin. Felicitari!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Calibrarea XYZ compromisa. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" @@ -2415,32 +2394,32 @@ msgstr "" "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrarea XYZ a esuat. Un punct de calibrare a patului nu a fost gasit." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrarea XYZ a esuat. Va rugam consultati manualul." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata dreapta nu pot fi " "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrarea XYZ ok. Axele X/Y sunt perpendiculare. Felicitari!" @@ -2450,34 +2429,34 @@ msgid "Y distance from min" msgstr "Distanta Y de la min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Corect. Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Puteti oricand sa reluati Wizard-ul din Calibrare -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Corect. Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Nr. Z-probe" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] offset origine" @@ -2487,38 +2466,122 @@ msgid "and press the knob" msgstr "si apasa butonul" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "a incarca filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "a scoate filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "necunoscut" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "vers. necunoscuta" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Reimprospata" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "Err. MMU curent" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Alege extruderul:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "Versiune FW MMU este incompatibil cu cea a imprimantei. Asigurati-va ca FW " +#~ "MMU este actualizat." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Citire FINDA neasteptata. Asig. ca nu este Fil. sub FINDA si selector-ul " +#~ "este liber. Verifica conexiune FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2572,9 +2635,6 @@ msgstr "🔃Reimprospata" #~ msgid "MMU needs user attention." #~ msgstr "MMU necesita atentia utilizatorului." -#~ msgid "MMU power fails" -#~ msgstr "Err. MMU curent" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Va rugam scoateti filamentul, iar apoi apasati butonul." @@ -2593,26 +2653,23 @@ msgstr "🔃Reimprospata" #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "" -#~ "Calibrarea XYZ compromisa. Punctele de calibrare din fata stanga nu pot " -#~ "fi atinse." +#~ "Calibrarea XYZ compromisa. Punctele de calibrare din fata stanga nu pot fi " +#~ "atinse." #~ msgid "XYZ calibration failed. Left front calibration point not reachable." #~ msgstr "" -#~ "Calibrarea XYZ a esuat. Punctul de calibrare stanga fata nu poate fi " -#~ "atinsa." +#~ "Calibrarea XYZ a esuat. Punctul de calibrare stanga fata nu poate fi atinsa." #~ msgid "" #~ "You are using firmware alpha version. This is development version. Using " #~ "this version is not recommended and may cause printer damage." #~ msgstr "" -#~ "Utilizati vers.alfa de FW. Acesta este vers. de dezvoltare. Folosind " -#~ "aceasta versiune nu este recomandata si poate cauza deteriorarea " -#~ "imprimantei" +#~ "Utilizati vers.alfa de FW. Acesta este vers. de dezvoltare. Folosind aceasta" +#~ " versiune nu este recomandata si poate cauza deteriorarea imprimantei" #~ msgid "" -#~ "You are using firmware beta version. This is development version. Using " -#~ "this version is not recommended and may cause printer damage." +#~ "You are using firmware beta version. This is development version. Using this" +#~ " version is not recommended and may cause printer damage." #~ msgstr "" #~ "Utilizati vers. beta de FW. Acesta este vers. de dezvoltare. Folosind " -#~ "aceasta versiune nu este recomandata si poate cauza deteriorarea " -#~ "imprimantei" +#~ "aceasta versiune nu este recomandata si poate cauza deteriorarea imprimantei" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index df70270b1..2d171aa40 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -17,88 +17,87 @@ msgstr "" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 a starsie" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 a novsie" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "Ocakavana verzia %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Doladenie Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Vsetko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Vsetko je hotove!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Okolie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Dosli oba Z voziky k hornemu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autozav. filamentu" @@ -116,53 +115,53 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Dlzka osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Spat" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Podlozka" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Zahrievanie podlozky" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Podlozka OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Korekcia podlozky" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." @@ -170,70 +169,70 @@ msgstr "" "Kalibracia Z zlyhala. Sensor nezopol. Znecistena tryska? Cakam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Podlozka/Zohrievanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Stav remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Test remena" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Nastal vypadok prudu. Obnovit tlac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Jasne" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Podsvietenie" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "COMMUNICATION ERROR" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibracia XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibracia XYZ. Otacanim tlacidla posunte Z os az k hornemu dorazu. Potvrdte " -"tlacidlom." +"Kalibracia XYZ. Otacanim tlacidla posunte Z os az k hornemu dorazu. Potvrdte" +" tlacidlom." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibrujem Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,45 +241,46 @@ msgstr "" "tlacidlom." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibr. vychodziu p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibracia" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibracia OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Selektor alebo Idler nie je mozne presunut." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." msgstr "" "Nie je mozne vykonat akciu, filament je uz zavedeny. Najskor ho vytiahnite." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Karta vysunuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Zmenit SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Vymenit filament" @@ -295,55 +295,55 @@ msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Kontrolujem subor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Kontrola senzorov" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Kontroly" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Vymazanie chyby TM" @@ -353,12 +353,12 @@ msgid "Color not correct" msgstr "Nespravna farba" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Komunitny prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Pokr." @@ -368,31 +368,31 @@ msgid "Cooldown" msgstr "Schladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Det. narazu" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Zisteny naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,34 +403,34 @@ msgstr "" "Normalnom rezime" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Odstrihnut filam." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Strihanie" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Tmavy" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Vypnut" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Vypnut motory" @@ -442,18 +442,18 @@ msgid "Disengaging idler" msgstr "Uvolnenie idlera" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Nie je skalibrovana vzdialenost trysky od podlozky. Postupujte prosim podla " "manualu, kapitola Zaciname, odstavec Nastavenie prvej vrstvy." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -462,12 +462,12 @@ msgstr "" "podlozkou?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Hotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "Korekcia E:" @@ -501,8 +501,8 @@ msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Vysunúť z MMU" @@ -514,17 +514,17 @@ msgid "Ejecting filament" msgstr "Vysunutie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Kon. spinac nezopol" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Konc. spinace" @@ -536,47 +536,45 @@ msgid "Engaging idler" msgstr "Zapojenie idlera" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F. zasek" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. vypadok" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "FILAMENT ALREADY LOA" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA DIDNT TRIGGER" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -585,7 +583,7 @@ msgstr "" "ze filament sa moze hybat a FINDA funguje." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -594,67 +592,67 @@ msgstr "" "spravne." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STUCK" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS Akcia" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR DIDNT TRIGG." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR TOO EARLY" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL. STUCK" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Statistiky zlyhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Zlyhania MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Falosne spustenie" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Kontr. vent." @@ -683,22 +681,23 @@ msgid "Feeding to nozzle" msgstr "Zavedenie do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -714,14 +713,14 @@ msgid "Filament not loaded" msgstr "Filament nezavedeny" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Senzor filamentu" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -730,7 +729,7 @@ msgstr "" "filament moze hybat a senzor funguje spravne." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -739,13 +738,13 @@ msgstr "" "filament dosiahol fsenzor a senzor funguje spravne." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Filament senzor sa zopol priskoro pocas zavedenia do extruderu. Skontrolujte " -"ci je PTFE trubicka priechodzia a senzor funguje spravne." +"Filament senzor sa zopol priskoro pocas zavedenia do extruderu. Skontrolujte" +" ci je PTFE trubicka priechodzia a senzor funguje spravne." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -753,36 +752,37 @@ msgid "Filament used" msgstr "Spotrebovany filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Subor nekompletny. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Dokoncovanie pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Kal. prvej vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najskor pomocou selftestu skontrolujem nejcastejsie chyby vznikajuce pri " "zostaveni tlaciarne." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Prietok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,28 +791,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Predny tlacovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Predna st.[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Predny/lavy vent." -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code pripraveny pre inu uroven. Pokracovat?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -820,28 +820,28 @@ msgstr "" "G-code pripraveny pre inu verziu. Vygenerujte G-code znova. Tlac zrusena." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code je pripraveny pre iny typ tlaciarne.Pokracovat?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code je pripraveny pre iny typ tlaciarne. Vygenerujte G-code znova. Tlac " "zrusena." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code je pripraveny pre novsi firmware. Pokracovat?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -850,35 +850,35 @@ msgstr "" "zrusena." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW nastavenie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Zohr./Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Zahrievanie" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Zohrievanie prerusene bezpecnostnym casovacom." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Zahrievanie OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +888,7 @@ msgstr "" "nastavenia, v ktorom skalibrujem os Z. Potom budete moct zacat tlacit." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +897,9 @@ msgstr "" "previedla kalibracnym procesom?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Vys. vykon" @@ -910,48 +910,48 @@ msgid "Homing" msgstr "Navrat" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend ma 280C! Tryska je vymenena a utiahnuta podla specifikacie?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Teraz urobim XYZ kalibraciu. Zaberie to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Teraz urobim kalibraciu Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER CANNOT HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "IDLER CANNOT MOVE" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "INVALID TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -960,17 +960,17 @@ msgstr "" "Platne" #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Zlepsenie bodu kalibracie podlozky" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Informacie" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Nacitanie SD karty" @@ -980,47 +980,47 @@ msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "Vlozte filament (nezavadzajte) do extruderu a stlacte tlacidlo" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware. Ak chyba " "pretrvava, kontaktujte podporu." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Je filament zavedeny?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Je platna na podlozke?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Opakovanie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Posledna tlac" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Zlyhanie posl. tlace" @@ -1030,57 +1030,57 @@ msgid "Left" msgstr "Vlavo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Lavy vent na tryske?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Lava str.[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Normalne" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Stlmene" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Korekcia lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Doladenie osi Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Zaviest vsetko" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Zaviest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Zaved. do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1090,69 +1090,70 @@ msgid "Loading color" msgstr "Cistenie farby" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Zavedenie filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Uvolnena remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Hlasny" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NEEDED" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Chyba MMU Firmwaru, resetujte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU NOT RESPONDING" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Obnovenie teploty..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SAMOTEST ZLYHAL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "Zlyhanie MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU zlyhalo" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1161,7 +1162,7 @@ msgstr "" "pretrvava, kontaktujte podporu." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1170,23 +1171,23 @@ msgstr "" "kontaktujte podporu." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 pripojene" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Hlavna ponuka" @@ -1196,83 +1197,84 @@ msgid "Measured skew" msgstr "Merane skos." #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Meriam referencnu vysku kalibracneho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Mriezka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Vyrovnanie podl." #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Rezim" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Prebieha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Viac podrobnosti online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Posunut X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Posunut Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Posunut Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Posunut os" @@ -1283,94 +1285,97 @@ msgid "Moving selector" msgstr "Presun selektora" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Vysla nova verzia firmware:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Ziadna SD karta" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Ziadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Nezapojene" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Netoci sa" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." -msgstr "Teraz skalibrujem vzdialenost medzi koncom trysky a povrchom podlozky." +msgstr "" +"Teraz skalibrujem vzdialenost medzi koncom trysky a povrchom podlozky." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Teraz predohrejem trysku pre PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Teraz odstrante testovaci vytlacok z platne." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Vymena trysky" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Tryska" @@ -1381,82 +1386,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Vyp" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastavenia. Bude pouzite predvolene PID, Esteps atd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "Raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSED THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibracia" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "Nahrievanie PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "Kalibracia PINDA zlyhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1465,7 +1470,7 @@ msgstr "" "menu Nastavenia->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "PULLEY CANNOT MOVE" @@ -1476,13 +1481,13 @@ msgid "Parking selector" msgstr "Parkovanie selektora" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pozastavit tlac" @@ -1493,7 +1498,7 @@ msgid "Performing cut" msgstr "Strihanie" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1503,7 +1508,7 @@ msgstr "" "tlacidlom X." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1512,35 +1517,35 @@ msgstr "" "restartovanim tlaciarne." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Prosim skontrolujte zapojenie IR senzoru a vyberte filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Skontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistite podlozku a stlacte tlacidlo." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" "Pre uspesnu kalibraciu ocistite prosim tlacovu trysku. Potvrdte tlacidlom." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Prosim vlozte filament do extruderu a stlacte tlacidlo k jeho zavedeniu" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,73 +1554,73 @@ msgstr "" "zavedeniu" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Prosim najskor zavedte filament" #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Prosim otvorte idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Umiestnite prosim platnu na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Pre vysunutie filamentu stlacte tlacidlo" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Prosim vyberte urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Najskor prosim odstrante prevozne pomocky." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim platnu z podlozky." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Najskor spustite kalibraciu XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyberte filament a zopakujte tuto akciu" #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Aktualizujte prosim." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Cakajte prosim" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Vypadky prudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Predohrev" @@ -1625,28 +1630,28 @@ msgid "Preheat the nozzle!" msgstr "Predohrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Predhrev trysky. Prosim cakajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Predohrev k strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Predhrev k vysunutiu" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Predhrev k zavedeniu" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Predohrev k vybratiu" @@ -1657,33 +1662,33 @@ msgid "Preparing blade" msgstr "Priprava cepele" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Stlacte tlacidlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Pre nahriatie trysky a pokracovanie stlacte tlacidlo." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Tlac prerusena" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Tlacovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Tlac z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Tlac pozastavena" @@ -1693,35 +1698,35 @@ msgid "Print time" msgstr "Cas tlace" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "IP adr. tlaciarne:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Tlaciaren nebola este skalibrovana. Postupujte prosim podla manualu, " "kapitola Zaciname, odstavec Postup kalibracie." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Priemer trysky tlaciarne sa lisi od G-code. Pokracovat?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Priemer trysky tlaciarne sa lisi od G-code. Prosim skontrolujte nastavenie. " "Tlac zrusena." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motor remenice sa zasekol. Skontrolujte, ze sa remenica moze hybat a jej " @@ -1734,37 +1739,37 @@ msgid "Pushing filament" msgstr "Tlacenie filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "QUEUE FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Zadna str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Obnovovanie tlace" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyberte stary filament a stlacte tlacidlo pre zavedenie noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Premenovat" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1773,29 +1778,24 @@ msgstr "" "nastroj mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Reset" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Obnovenie tlace" @@ -1806,7 +1806,7 @@ msgid "Retract from FINDA" msgstr "Vybrat z FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Znova" @@ -1822,12 +1822,12 @@ msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Prava str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1836,69 +1836,64 @@ msgstr "" "kalibracny proces od zaciatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD karta" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR CANNOT HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR CANNOT MOVE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "ZASTAVENE." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Hladam kalibracny bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Zvolte filament pre kalibraciu prvej vrstvy z nasledujuceho menu" -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Zvolte extruder:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predohrevu trysky ktora zodpoveda vasmu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktora odpoveda vasmu materialu." @@ -1909,56 +1904,56 @@ msgid "Selecting fil. slot" msgstr "Vyber slotu fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Samotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Zaciatok testu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Samotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Chyba samotestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Samotest zlyhal" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Bude spusteny test pre kalibraciu presneho navratu." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Senzor overeny, vyberte filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Nastavenia" @@ -1968,13 +1963,13 @@ msgid "Severe skew" msgstr "Tazke skos." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Platna" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1987,13 +1982,13 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Tichy" @@ -2003,7 +1998,7 @@ msgid "Slight skew" msgstr "Lahke skos." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2012,169 +2007,163 @@ msgstr "" "zoradenie je 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytol sa problem, zarovnam os Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Triedit" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Triedenie suborov" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Toci sa" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilna izbova teplota 21-26C a pevna podlozka." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Platne" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Zast." #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Zastavit tlac" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Prehodene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER ERROR" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER SHORTED" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVERHEAT ERROR" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" 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álneho modelu trvá asi 12 min. Pozri\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Výpočet termálneho modelu trvá asi 12 min. Pozri\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Termálny model zatiaľ nebol kalibrovaný" #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Kontrola filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -"Idler sa nemoze vratit na miesto. Skontrolujte ci nieco neblokuje jeho pohyb." - -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"Verzia FW MMU je nekompatibilna s FW tlaciarne. Skontrolujte aktualizacie " -"MMU firmwaru." +"Idler sa nemoze vratit na miesto. Skontrolujte ci nieco neblokuje jeho " +"pohyb." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2182,7 +2171,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2192,7 +2181,7 @@ msgstr "" "vysku. Postupujte podla obrazku v handbooku (kapitola Kalibracia)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2201,24 +2190,24 @@ msgstr "" "Zaciname, sekcia Postup kalibracie." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Casovac" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Celkom" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Celkom zlyhani" @@ -2233,39 +2222,30 @@ msgid "Total print time" msgstr "Celkovy cas tlace" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Ladit" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "UNLOAD MANUALLY" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Neocakavane nacitanie FINDA. Skontrolujte, ze filament nie je pod FINDA a " -"selektor je volny. Skontrolujte pripojenie FINDA." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Vysuv" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Vybrat filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Vysuvanie filamentu" @@ -2282,23 +2262,23 @@ msgid "Unloading to pulley" msgstr "Vysuv. do remenice" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Overenie zlyhalo, vyberte filament a skuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Napatie" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "WARNING TMC TOO HOT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2311,119 +2291,118 @@ msgstr "" "Tichom rezime" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Caka sa na uzivatela" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Caka sa na ochladenie PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Cakanie na schladenie trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Varovat" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Varovanie: doslo k zmene typu tlaciarne a maticnej dosky." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Varovanie: doslo k zmene typu maticnej dosky." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Varovanie: doslo k zmene typu tlaciarne." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Bolo vysunutie filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Chyba zapojenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Sprievodca" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "Korekcia X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Kalibracia XYZ v poriadku. Skosenie bude automaticky vyrovnane pri tlaci." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracia XYZ v poriadku. X/Y osi mierne skosene. Dobra praca!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibracia XYZ je nepresna. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracia XYZ je nepresna. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracia XYZ zlyhala. Kalibracny bod podlozky nenajdeny." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibracia XYZ zlyhala. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracia XYZ zlyhala. Nahliadnite do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibracia XYZ zlyhala. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracia XYZ v poradku. X/Y osi su kolme. Gratulujeme!" @@ -2433,35 +2412,35 @@ msgid "Y distance from min" msgstr "Y vzdialenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Korekcia Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Sprievodcu mozete kedykolvek znovu spustit z menu Kalibracia -> Sprievodca" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Korekcia Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Pocet merani Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] odsadenie bodu" @@ -2471,38 +2450,122 @@ msgid "and press the knob" msgstr "a stlacte tlacidlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "k zavedeniu filam." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "k vybraniu filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "neznamy" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "neznamy stav" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Obnovit" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU vyp. prudu" + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Zvolte extruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "Verzia FW MMU je nekompatibilna s FW tlaciarne. Skontrolujte aktualizacie " +#~ "MMU firmwaru." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Neocakavane nacitanie FINDA. Skontrolujte, ze filament nie je pod FINDA a " +#~ "selektor je volny. Skontrolujte pripojenie FINDA." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "" @@ -2556,9 +2619,6 @@ msgstr "🔃Obnovit" #~ msgid "MMU needs user attention." #~ msgstr "MMU potrebuje zasah uzivatela." -#~ msgid "MMU power fails" -#~ msgstr "MMU vyp. prudu" - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Prosim vyberte filament a potom stlacte tlacidlo." @@ -2585,12 +2645,12 @@ msgstr "🔃Obnovit" #~ "You are using firmware alpha version. This is development version. Using " #~ "this version is not recommended and may cause printer damage." #~ msgstr "" -#~ "Pouzivate ALPHA verziu firmveru. Toto je vyvojova verzia. Pouzivanie " -#~ "tejto verzie sa neodporuca a moze sposobit poskodenie tlaciarne." +#~ "Pouzivate ALPHA verziu firmveru. Toto je vyvojova verzia. Pouzivanie tejto " +#~ "verzie sa neodporuca a moze sposobit poskodenie tlaciarne." #~ msgid "" -#~ "You are using firmware beta version. This is development version. Using " -#~ "this version is not recommended and may cause printer damage." +#~ "You are using firmware beta version. This is development version. Using this" +#~ " version is not recommended and may cause printer damage." #~ msgstr "" #~ "Pouzivate BETA verziu firmveru. Toto je vyvojova verzia. Pouzivanie tejto " #~ "verzie sa neodporuca a moze sposobit poskodenie tlaciarne." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index dd11a610d..4ffb610ae 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -11,94 +11,93 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. MSG_IR_03_OR_OLDER c=18 #: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:165 +#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 msgid " 0.3 or older" msgstr " 0.3 el äldre" #. MSG_IR_04_OR_NEWER c=18 #: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:164 +#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 msgid " 0.4 or newer" msgstr " 0.4 el nyare" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:7017 +#: ../../Firmware/ultralcd.cpp:6880 msgid "%s level expected" msgstr "%s nivå förväntad" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1973 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 +#: ../../Firmware/ultralcd.cpp:3686 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2661 +#: ../../Firmware/ultralcd.cpp:2651 msgid "Adjusting Z:" msgstr "Justerar Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7293 +#: ../../Firmware/ultralcd.cpp:7150 msgid "All correct" msgstr "Allt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4122 -#: ../../Firmware/ultralcd.cpp:4131 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 msgid "All is done. Happy printing!" msgstr "Allt är klart. God utskrift!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/ultralcd.cpp:4781 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4276 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1399 +#: ../../Firmware/ultralcd.cpp:1385 msgid "Ambient" msgstr "Omgivande" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2974 +#: ../../Firmware/ultralcd.cpp:2873 msgid "Are left and right Z~carriages all up?" msgstr "Är båda Z-vagnarna helt uppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4842 +#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Auto home" msgstr "Auto hem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:5751 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:5627 msgid "Auto power" msgstr "Auto kraft" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5558 +#: ../../Firmware/ultralcd.cpp:5432 msgid "AutoLoad filament" msgstr "Autoladda filament" @@ -116,110 +115,110 @@ msgid "Avoiding grind" msgstr "Undviker slipning" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6996 +#: ../../Firmware/ultralcd.cpp:6859 msgid "Axis" msgstr "Axel" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/ultralcd.cpp:6858 msgid "Axis length" msgstr "Axellängd" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2742 -#: ../../Firmware/ultralcd.cpp:4212 ../../Firmware/ultralcd.cpp:5833 -#: ../../Firmware/ultralcd.cpp:7812 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 +#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 +#: ../../Firmware/ultralcd.cpp:7657 msgid "Back" msgstr "Tillbaka" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2025 ../../Firmware/Marlin_main.cpp:4789 -#: ../../Firmware/Marlin_main.cpp:4841 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1397 ../../Firmware/ultralcd.cpp:5708 -#: ../../Firmware/ultralcd.cpp:5863 +#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 +#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 +#: ../../Firmware/ultralcd.cpp:5733 msgid "Bed" msgstr "Bädd" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6290 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:569 +#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:540 msgid "Bed Heating" msgstr "Bädden värms upp" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6328 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:572 +#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:543 msgid "Bed done" msgstr "Bädd klar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4854 +#: ../../Firmware/ultralcd.cpp:4727 msgid "Bed level correct" msgstr "Bäddnivå korrekt" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2206 ../../Firmware/Marlin_main.cpp:2982 -#: ../../Firmware/Marlin_main.cpp:2992 -#: ../../Firmware/mesh_bed_calibration.cpp:2858 -#: ../../Firmware/mesh_bed_calibration.cpp:2866 -#: ../../Firmware/mesh_bed_calibration.cpp:2892 ../../Firmware/messages.cpp:15 +#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2980 +#: ../../Firmware/mesh_bed_calibration.cpp:2859 +#: ../../Firmware/mesh_bed_calibration.cpp:2867 +#: ../../Firmware/mesh_bed_calibration.cpp:2893 ../../Firmware/messages.cpp:15 msgid "" "Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for " "reset." msgstr "" -"Bäddnivelleringen felade. Sensorn utlöstes inte. Skräp på munstycket? Väntar " -"på återställning." +"Bäddnivelleringen felade. Sensorn utlöstes inte. Skräp på munstycket? Väntar" +" på återställning." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6953 +#: ../../Firmware/ultralcd.cpp:6816 msgid "Bed/Heater" msgstr "Bädd/Värmare" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1450 -#: ../../Firmware/ultralcd.cpp:1719 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 +#: ../../Firmware/ultralcd.cpp:1705 msgid "Belt status" msgstr "Bält status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4844 +#: ../../Firmware/ultralcd.cpp:4717 msgid "Belt test" msgstr "Bält test" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1581 ../../Firmware/Marlin_main.cpp:1603 +#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 #: ../../Firmware/messages.cpp:81 msgid "Blackout occurred. Recover print?" msgstr "Blackout inträffat. Återställa utskr?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 msgid "Bright" msgstr "Ljus" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4792 -#: ../../Firmware/ultralcd.cpp:5761 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 +#: ../../Firmware/ultralcd.cpp:5637 msgid "Brightness" msgstr "Ljusstyrka" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:154 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4848 +#: ../../Firmware/ultralcd.cpp:4721 msgid "Calibrate XYZ" msgstr "Kalibrera XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4850 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 msgid "Calibrate Z" msgstr "Kalibrera Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2937 +#: ../../Firmware/ultralcd.cpp:2835 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,13 +227,13 @@ msgstr "" "Klicka när du är klar." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2162 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:619 +#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:577 msgid "Calibrating Z" msgstr "Kalibrerar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2936 +#: ../../Firmware/ultralcd.cpp:2834 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,44 +242,46 @@ msgstr "" "Klicka när du är klar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7295 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Calibrating home" msgstr "Kalibrerar hem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5568 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:630 +#: ../../Firmware/ultralcd.cpp:588 msgid "Calibration done" msgstr "Kalibraring utförd" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:213 ../../Firmware/mmu2/errors_list.h:253 -#: ../../Firmware/mmu2/errors_list.h:255 +#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 +#: ../../Firmware/mmu2/errors_list.h:287 msgid "Can't move Selector or Idler." msgstr "Kan inte flytta väljaren eller Idlern." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:279 -msgid "Cannot perform the action, filament is already loaded. Unload it first." -msgstr "Kan inte utföra åtgärden, filament är redan laddat. Ta bort det först." +#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +msgid "" +"Cannot perform the action, filament is already loaded. Unload it first." +msgstr "" +"Kan inte utföra åtgärden, filament är redan laddat. Ta bort det först." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7686 +#: ../../Firmware/ultralcd.cpp:7544 msgid "Card removed" msgstr "Kort borttaget" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5521 +#: ../../Firmware/ultralcd.cpp:5396 msgid "Change SD card" msgstr "Byt ut SD-kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5480 -#: ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 +#: ../../Firmware/ultralcd.cpp:5591 msgid "Change filament" msgstr "Ändra filament" @@ -295,55 +296,55 @@ msgid "Changed correctly?" msgstr "Ändring korrekt?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6169 -#: ../../Firmware/ultralcd.cpp:7285 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 +#: ../../Firmware/ultralcd.cpp:7142 msgid "Checking X axis" msgstr "Kontroll X-axel" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6178 -#: ../../Firmware/ultralcd.cpp:7286 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 +#: ../../Firmware/ultralcd.cpp:7143 msgid "Checking Y axis" msgstr "Kontroll Y-axel" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7287 +#: ../../Firmware/ultralcd.cpp:7144 msgid "Checking Z axis" msgstr "Kontroll Z-axel" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7288 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 msgid "Checking bed" msgstr "Kontroll bädd" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7284 +#: ../../Firmware/ultralcd.cpp:7141 msgid "Checking endstops" msgstr "Kontroll ändlägen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7383 +#: ../../Firmware/ultralcd.cpp:7239 msgid "Checking file" msgstr "Kontrollerar fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7290 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking hotend" msgstr "Kontroll hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7291 -#: ../../Firmware/ultralcd.cpp:7292 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking sensors" msgstr "Kontroll sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4686 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Checks" msgstr "Kontroller" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5490 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 msgid "Clear TM error" msgstr "Rensa TM-fel" @@ -353,12 +354,12 @@ msgid "Color not correct" msgstr "Färg ej korrekt" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 msgid "Community made" msgstr "Allmänhetsgjord" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 msgid "Cont." msgstr "Frts." @@ -368,31 +369,31 @@ msgid "Cooldown" msgstr "Kyla ner" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3623 +#: ../../Firmware/ultralcd.cpp:3514 msgid "Copy selected language?" msgstr "Kopiera det valda språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1240 -#: ../../Firmware/ultralcd.cpp:1269 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 +#: ../../Firmware/ultralcd.cpp:1255 msgid "Crash" msgstr "Krock" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4328 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:4331 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5739 -#: ../../Firmware/ultralcd.cpp:5743 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Crash det." msgstr "Krockdetekt." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:586 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Krock upptäckt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3527 +#: ../../Firmware/ultralcd.cpp:3418 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,34 +404,34 @@ msgstr "" "normalt läge" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:5129 -#: ../../Firmware/ultralcd.cpp:5552 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Skär filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:129 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4276 ../../Firmware/ultralcd.cpp:4281 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 msgid "Cutter" msgstr "Skärare" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1660 +#: ../../Firmware/ultralcd.cpp:1646 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 msgid "Dim" msgstr "Dim" -#. MSG_BTN_DISABLE_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:300 ../../Firmware/mmu2/errors_list.h:310 +#. MSG_BTN_DISABLE_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" msgstr "Inaktiver" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Disable steppers" msgstr "Inaktivera stepper" @@ -442,18 +443,18 @@ msgid "Disengaging idler" msgstr "Kopplar ur Idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1526 ../../Firmware/Marlin_main.cpp:3397 +#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 #: ../../Firmware/messages.cpp:11 msgid "" -"Distance between tip of the nozzle and the bed surface has not been set yet. " -"Please follow the manual, chapter First steps, section First layer " +"Distance between tip of the nozzle and the bed surface has not been set yet." +" Please follow the manual, chapter First steps, section First layer " "calibration." msgstr "" "Avståndet mellan munstyckets spets och bäddytan har inte ställts in ännu. " "Vänligen följ manualen Första lagrets kalibrering." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4096 +#: ../../Firmware/ultralcd.cpp:4007 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -462,12 +463,12 @@ msgstr "" "bädden?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:296 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4165 +#: ../../Firmware/ultralcd.cpp:4076 msgid "E-correct:" msgstr "E-korrektion:" @@ -501,8 +502,8 @@ msgid "ERROR:" msgstr "FEL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 -#: ../../Firmware/ultralcd.cpp:5549 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Utmat från MMU" @@ -514,17 +515,17 @@ msgid "Ejecting filament" msgstr "Matar ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6966 +#: ../../Firmware/ultralcd.cpp:6829 msgid "Endstop" msgstr "Ändläge" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6971 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop not hit" msgstr "Ändlage inte nått" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6957 +#: ../../Firmware/ultralcd.cpp:6820 msgid "Endstops" msgstr "Ändlägen" @@ -536,47 +537,45 @@ msgid "Engaging idler" msgstr "Koppla in Idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:30 -#: ../../Firmware/ultralcd.cpp:3501 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1715 +#: ../../Firmware/ultralcd.cpp:1701 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4219 -#: ../../Firmware/ultralcd.cpp:4226 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4137 msgid "F. autoload" msgstr "F. autoladdn" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:4139 msgid "F. jam detect" msgstr "F.stopp skett" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4225 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4136 msgid "F. runout" msgstr "F. slut" #. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:155 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 msgid "FILAMENT ALREADY LOA" msgstr "F. REDAN INLADDAT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:124 ../../Firmware/mmu2/errors_list.h:163 +#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA TRIGGADES EJ" #. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:207 ../../Firmware/mmu2/errors_list.h:247 +#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -585,7 +584,7 @@ msgstr "" "manuellt. Se till att filamentet kan röra sig och att FINDA fungerar." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:246 +#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -594,67 +593,67 @@ msgstr "" "röra sig och att FINDA fungerar." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:125 ../../Firmware/mmu2/errors_list.h:164 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STOPP" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/ultralcd.cpp:4148 msgid "FS Action" msgstr "FS aktion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:126 ../../Firmware/mmu2/errors_list.h:165 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR TRIGGADE EJ." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:129 ../../Firmware/mmu2/errors_list.h:168 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR FÖR TIDIG" #. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:127 ../../Firmware/mmu2/errors_list.h:166 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 msgid "FSENSOR: FIL. STUCK" msgstr "FSENSOR: FIL. STOPP" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:200 +#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5576 +#: ../../Firmware/ultralcd.cpp:5450 msgid "Fail stats" msgstr "Felstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5453 msgid "Fail stats MMU" msgstr "Felstatistik MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:6875 msgid "False triggering" msgstr "Felaktig triggning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5710 -#: ../../Firmware/ultralcd.cpp:5865 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5735 msgid "Fan speed" msgstr "Fläktfart" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:7123 -#: ../../Firmware/ultralcd.cpp:7281 ../../Firmware/ultralcd.cpp:7282 -#: ../../Firmware/ultralcd.cpp:7283 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 +#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 +#: ../../Firmware/ultralcd.cpp:7140 msgid "Fan test" msgstr "Fläkttest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:5728 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:5604 msgid "Fans check" msgstr "Fläktcheck" @@ -683,22 +682,23 @@ msgid "Feeding to nozzle" msgstr "Matar till munstycke" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1239 -#: ../../Firmware/ultralcd.cpp:1268 ../../Firmware/ultralcd.cpp:1322 -#: ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 +#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 +#: ../../Firmware/ultralcd.cpp:1310 msgid "Fil. runouts" msgstr "Fil. avbrott" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3462 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4726 -#: ../../Firmware/ultralcd.cpp:5721 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:5595 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3686 msgid "Filament" msgstr "Filament" @@ -714,14 +714,14 @@ msgid "Filament not loaded" msgstr "Filament ej laddat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7011 ../../Firmware/ultralcd.cpp:7015 -#: ../../Firmware/ultralcd.cpp:7310 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 +#: ../../Firmware/ultralcd.cpp:7167 msgid "Filament sensor" msgstr "Filament sensor" #. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:249 +#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -730,7 +730,7 @@ msgstr "" "filamentet kan röra sig och att sensornfungerar." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:248 +#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." @@ -739,13 +739,13 @@ msgstr "" "filamentet kan röra sig och att sensornfungerar." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:251 +#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." msgstr "" -"Filamentsensorn triggades för tidigt under laddning till extruder." -"Kontrollera PFFE-slang och att sensorn läser korrekt." +"Filamentsensorn triggades för tidigt under laddning till " +"extruder.Kontrollera PFFE-slang och att sensorn läser korrekt." #. MSG_FILAMENT_USED c=19 #: ../../Firmware/ultralcd.cpp:2356 @@ -753,66 +753,65 @@ msgid "Filament used" msgstr "Använt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7441 +#: ../../Firmware/ultralcd.cpp:7297 msgid "File incomplete. Continue anyway?" msgstr "Filen är ofullständig. Fortsätta ändå?" #. MSG_FINISHING_MOVEMENTS c=20 -#: ../../Firmware/messages.cpp:41 ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5297 ../../Firmware/ultralcd.cpp:5617 +#: ../../Firmware/messages.cpp:41 +#: ../../Firmware/mmu2_progress_converter.cpp:43 +#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 msgid "Finishing movements" msgstr "Avslutar flyttning" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:4840 -#: ../../Firmware/ultralcd.cpp:5407 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 +#: ../../Firmware/ultralcd.cpp:5277 msgid "First layer cal." msgstr "Förstalager kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4021 +#: ../../Firmware/ultralcd.cpp:3928 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Först kommer jag att utföra självtestet för att kontrollera de vanligaste " "monteringsproblemen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/ultralcd.cpp:5585 msgid "Flow" msgstr "Flöde" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" -msgstr "" -"För byte av munstycke, läs" -"prusa.io/nozzle-mk3s" +msgstr "För byte av munstycke, läsprusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6977 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Front print fan?" msgstr "Frontfläkt?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2745 +#: ../../Firmware/ultralcd.cpp:2727 msgid "Front side[µm]" msgstr "Frontsida[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:7001 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Front/left fans" msgstr "Front/vänster fläkt" -#. MSG_GCODE_DIFF_CONTINUE c=20 r=4 -#: ../../Firmware/util.cpp:402 +#. MSG_GCODE_DIFF_CONTINUE c=20 r=3 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" msgstr "G-code genererad för en annan nivå. Fortsätta?" -#. MSG_GCODE_DIFF_CANCELLED c=20 r=7 -#: ../../Firmware/util.cpp:409 +#. MSG_GCODE_DIFF_CANCELLED c=20 r=8 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -821,28 +820,28 @@ msgstr "" "Utskriften avbröts." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:323 -#: ../../Firmware/util.cpp:454 +#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 +#: ../../Firmware/util.cpp:439 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code genererad för en annan skrivartyp. Fortsätta?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:329 -#: ../../Firmware/util.cpp:460 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 +#: ../../Firmware/util.cpp:440 msgid "" -"G-code sliced for a different printer type. Please re-slice the model again. " -"Print cancelled." +"G-code sliced for a different printer type. Please re-slice the model again." +" Print cancelled." msgstr "" "G-code genererad för en annan skrivartyp. Vänligen re-generera modellen " "igen. Utskriften avbröts." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:370 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code genererad för en nyare firmware. Fortsätta?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/util.cpp:377 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -851,35 +850,35 @@ msgstr "" "Utskriften avbröts." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4647 ../../Firmware/ultralcd.cpp:4747 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 +#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 msgid "HW Setup" msgstr "HW inställning" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6949 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Heater/Thermistor" msgstr "Värmare/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6233 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:561 +#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:532 msgid "Heating" msgstr "Uppvärmning" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9474 +#: ../../Firmware/Marlin_main.cpp:9370 msgid "Heating disabled by safety timer." msgstr "Uppvärmning avaktiverad av säkerhetstimer." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6264 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:564 +#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:535 msgid "Heating done." msgstr "Uppvärmning klar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3997 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -890,7 +889,7 @@ msgstr "" "att skriva ut." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4000 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -899,9 +898,9 @@ msgstr "" "installationsprocessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5752 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5628 msgid "High power" msgstr "Hög kraft" @@ -912,49 +911,48 @@ msgid "Homing" msgstr "Flyttar till hempos" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend temperatur är 280C! Är munstycket bytt och spänt enligt specs?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7301 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7158 msgid "Hotend fan:" msgstr "Hotend-fläkt:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4030 +#: ../../Firmware/ultralcd.cpp:3933 msgid "I will run xyz calibration now. It will take up to 24 mins." -msgstr "" -"Jag kommer att utföra en xyz-kalibrering nu. Det tar upp till 24 min." +msgstr "Jag kommer att utföra en xyz-kalibrering nu. Det tar upp till 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4038 +#: ../../Firmware/ultralcd.cpp:3944 msgid "I will run z calibration now." msgstr "Jag kommer att utföra z-kalibrering nu." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:133 ../../Firmware/mmu2/errors_list.h:171 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 msgid "IDLER CANNOT HOME" msgstr "IDLER HEMPOS FEL" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:132 ../../Firmware/mmu2/errors_list.h:172 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 msgid "IDLER CANNOT MOVE" msgstr "IDLER KAN EJ FLYTTA" -#. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:197 +#. MSG_TITLE_INSPECT_FINDA c=20 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 msgid "INVALID TOOL" msgstr "OGILTIGT VERKTYG" #. MSG_ADDITIONAL_SHEETS c=20 r=9 -#: ../../Firmware/ultralcd.cpp:4104 +#: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -963,17 +961,17 @@ msgstr "" "Inställningar - HW inställning - Metallskiva." #. MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2530 +#: ../../Firmware/mesh_bed_calibration.cpp:2531 msgid "Improving bed calibration point" msgstr "Förbättrar bäddens kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5461 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 msgid "Info screen" msgstr "Infoskärm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5528 +#: ../../Firmware/ultralcd.cpp:5403 msgid "Init. SD card" msgstr "Init. SD-kort" @@ -983,48 +981,49 @@ msgid "Insert filament" msgstr "Sätt i filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6215 +#: ../../Firmware/ultralcd.cpp:6077 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." msgstr "" -"Infoga filamentet (ladda inte in det) i extrudern och tryck sedan på knappen." +"Infoga filamentet (ladda inte in det) i extrudern och tryck sedan på " +"knappen." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 -#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware. " -"If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU unit or updating the firmware." +" If the issue persists, contact support." msgstr "" "Internt körtidsfel. Prova återställa MMU-enheten eller uppdatera firmware. " "Kontakta supporten om problemet kvarstår." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3816 -#: ../../Firmware/ultralcd.cpp:4063 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 +#: ../../Firmware/ultralcd.cpp:3974 msgid "Is filament loaded?" msgstr "Är filament laddat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3298 ../../Firmware/Marlin_main.cpp:4908 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 msgid "Is steel sheet on heatbed?" msgstr "Ligger metallskiva på värmebädden?" #. MSG_ITERATION c=12 -#: ../../Firmware/mesh_bed_calibration.cpp:2252 ../../Firmware/messages.cpp:51 +#: ../../Firmware/mesh_bed_calibration.cpp:2253 ../../Firmware/messages.cpp:51 msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1159 -#: ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1278 msgid "Last print" msgstr "Senaste utskrift" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:1179 -#: ../../Firmware/ultralcd.cpp:1266 ../../Firmware/ultralcd.cpp:1321 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 +#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 msgid "Last print failures" msgstr "Senaste utskriftsfel" @@ -1034,57 +1033,57 @@ msgid "Left" msgstr "Vänster" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6983 -#: ../../Firmware/ultralcd.cpp:7129 ../../Firmware/ultralcd.cpp:7134 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 msgid "Left hotend fan?" msgstr "Vänst hotend fläkt?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2743 +#: ../../Firmware/ultralcd.cpp:2725 msgid "Left side [µm]" msgstr "Vänstsida [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5834 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 msgid "Level Bright" msgstr "Ljusnivå" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5835 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 msgid "Level Dimmed" msgstr "Nivå dämpad" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4755 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Lin. correction" msgstr "Linjär korrektion" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4767 -#: ../../Firmware/ultralcd.cpp:5476 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 +#: ../../Firmware/ultralcd.cpp:5346 msgid "Live adjust Z" msgstr "Live justera Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:172 ../../Firmware/ultralcd.cpp:5072 -#: ../../Firmware/ultralcd.cpp:5152 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 +#: ../../Firmware/ultralcd.cpp:5025 msgid "Load All" msgstr "Ladda alla" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:5074 -#: ../../Firmware/ultralcd.cpp:5093 ../../Firmware/ultralcd.cpp:5154 -#: ../../Firmware/ultralcd.cpp:5545 ../../Firmware/ultralcd.cpp:5563 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 +#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 +#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 msgid "Load filament" msgstr "Ladda filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5547 +#: ../../Firmware/ultralcd.cpp:5421 msgid "Load to nozzle" msgstr "Ladd till munstyck" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4419 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" msgstr "" @@ -1094,69 +1093,70 @@ msgid "Loading color" msgstr "Laddar färg" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3648 ../../Firmware/messages.cpp:58 -#: ../../Firmware/mmu2.cpp:456 ../../Firmware/mmu2.cpp:486 +#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/ultralcd.cpp:2205 ../../Firmware/ultralcd.cpp:3908 +#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laddar filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:6852 msgid "Loose pulley" msgstr "Lös pulley" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4330 msgid "Loud" msgstr "Högt" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:158 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE KRÄVS" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware internt fel, vänligen återställ MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/ultralcd.cpp:4368 -#: ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 +#: ../../Firmware/ultralcd.cpp:4274 msgid "MMU Mode" msgstr "MMU-läge" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:194 +#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 msgid "MMU NOT RESPONDING" msgstr "MMU SVARAR INTE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2.cpp:619 +#: ../../Firmware/mmu2_reporting.cpp:331 msgid "MMU Retry: Restoring temperature..." msgstr "MMU försök igen: Återställer temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:191 -#: ../../Firmware/mmu2/errors_list.h:192 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 +#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 msgid "MMU SELFTEST FAILED" msgstr "MMU SJÄLVTEST FELADE" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1180 -#: ../../Firmware/ultralcd.cpp:1208 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 +#: ../../Firmware/ultralcd.cpp:1169 msgid "MMU fails" msgstr "MMU felar" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1181 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 +#: ../../Firmware/ultralcd.cpp:1170 msgid "MMU load fails" msgstr "MMU-laddn felar" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" "MMU unit not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." @@ -1165,7 +1165,7 @@ msgstr "" "problemet kvarstår, kontakta supporten." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:277 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" "MMU unit not responding. Check the wiring and connectors. If the issue " "persists, contact support." @@ -1174,23 +1174,23 @@ msgstr "" "kvarstår, kontakta supporten." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1658 msgid "MMU2 connected" msgstr "MMU2 ansluten" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." msgstr "Magnets komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1158 -#: ../../Firmware/ultralcd.cpp:1291 ../../Firmware/ultralcd.cpp:1333 -#: ../../Firmware/ultralcd.cpp:1637 ../../Firmware/ultralcd.cpp:4715 -#: ../../Firmware/ultralcd.cpp:4834 ../../Firmware/ultralcd.cpp:5071 -#: ../../Firmware/ultralcd.cpp:5091 ../../Firmware/ultralcd.cpp:5109 -#: ../../Firmware/ultralcd.cpp:5127 ../../Firmware/ultralcd.cpp:5151 -#: ../../Firmware/ultralcd.cpp:5704 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 +#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 +#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 +#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 +#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 +#: ../../Firmware/ultralcd.cpp:5578 msgid "Main" msgstr "Huvudmeny" @@ -1200,83 +1200,84 @@ msgid "Measured skew" msgstr "Mätt skevhet" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3279 -#: ../../Firmware/mesh_bed_calibration.cpp:2836 ../../Firmware/messages.cpp:66 +#: ../../Firmware/Marlin_main.cpp:3259 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 msgid "Measuring reference height of calibration point" msgstr "Mätning av referenshöjd för kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:5804 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 msgid "Mesh" msgstr "Nätverk" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4752 -#: ../../Firmware/ultralcd.cpp:4852 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 +#: ../../Firmware/ultralcd.cpp:4725 msgid "Mesh Bed Leveling" msgstr "Bäddytsjustering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4325 ../../Firmware/ultralcd.cpp:4345 -#: ../../Firmware/ultralcd.cpp:4348 ../../Firmware/ultralcd.cpp:4351 -#: ../../Firmware/ultralcd.cpp:4354 ../../Firmware/ultralcd.cpp:5735 -#: ../../Firmware/ultralcd.cpp:5742 ../../Firmware/ultralcd.cpp:5749 -#: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751 -#: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 +#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 +#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 +#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/ultralcd.cpp:3467 msgid "Mode change in progress..." msgstr "Lägesändring pågår..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4537 -#: ../../Firmware/ultralcd.cpp:4540 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 +#: ../../Firmware/ultralcd.cpp:4450 msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:256 -#: ../../Firmware/mmu2/errors_list.h:257 ../../Firmware/mmu2/errors_list.h:258 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:260 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:262 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:264 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:266 -#: ../../Firmware/mmu2/errors_list.h:267 ../../Firmware/mmu2/errors_list.h:268 -#: ../../Firmware/mmu2/errors_list.h:269 ../../Firmware/mmu2/errors_list.h:270 -#: ../../Firmware/mmu2/errors_list.h:271 ../../Firmware/mmu2/errors_list.h:272 -#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:274 -#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 +#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 +#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 +#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 +#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 +#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 +#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 +#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 +#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 +#: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:309 msgid "More details online." msgstr "Mera detaljer online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6963 -#: ../../Firmware/ultralcd.cpp:6972 ../../Firmware/ultralcd.cpp:6990 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 +#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3498 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Move X" msgstr "Flytta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3499 +#: ../../Firmware/ultralcd.cpp:3390 msgid "Move Y" msgstr "Flytta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3500 +#: ../../Firmware/ultralcd.cpp:3391 msgid "Move Z" msgstr "Flytta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4590 msgid "Move axis" msgstr "Flytta axlar" @@ -1287,95 +1288,97 @@ msgid "Moving selector" msgstr "Flyttar väljare" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:196 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2538 -#: ../../Firmware/ultralcd.cpp:3423 ../../Firmware/ultralcd.cpp:4218 -#: ../../Firmware/ultralcd.cpp:4219 ../../Firmware/ultralcd.cpp:4221 -#: ../../Firmware/ultralcd.cpp:5808 +#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 +#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 +#: ../../Firmware/ultralcd.cpp:5684 msgid "N/A" msgstr "N/A" #. MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 -#: ../../Firmware/util.cpp:199 +#: ../../Firmware/util.cpp:213 msgid "New firmware version available:" msgstr "Ny firmware vers tillgänglig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:2795 -#: ../../Firmware/ultralcd.cpp:3163 ../../Firmware/ultralcd.cpp:4705 -#: ../../Firmware/ultralcd.cpp:5979 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 +#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5869 msgid "No" msgstr "Nej" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5526 +#: ../../Firmware/ultralcd.cpp:5401 msgid "No SD card" msgstr "Inget SD-kort" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5399 +#: ../../Firmware/Marlin_main.cpp:5296 msgid "No move." msgstr "Ingen rörelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4449 -#: ../../Firmware/ultralcd.cpp:4458 ../../Firmware/ultralcd.cpp:4531 -#: ../../Firmware/ultralcd.cpp:4540 ../../Firmware/ultralcd.cpp:4570 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4611 -#: ../../Firmware/ultralcd.cpp:4620 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 +#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 +#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 +#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4368 ../../Firmware/ultralcd.cpp:4777 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 +#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/ultralcd.cpp:5611 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6950 +#: ../../Firmware/ultralcd.cpp:6813 msgid "Not connected" msgstr "Inte ansluten" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7163 ../../Firmware/ultralcd.cpp:7171 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 +#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 msgid "Not spinning" msgstr "Roterar inte" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3917 +#: ../../Firmware/ultralcd.cpp:3808 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Nu ska jag kalibrera avståndet mellan munstyckets spets och värmebäddsytan." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:3953 msgid "Now I will preheat nozzle for PLA." msgstr "Nu ska jag förvärma munstycket för PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:4037 +#: ../../Firmware/ultralcd.cpp:3939 msgid "Now remove the test print from steel sheet." msgstr "Ta nu bort testutskriften från metallskivan." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1396 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4458 -#: ../../Firmware/ultralcd.cpp:5707 ../../Firmware/ultralcd.cpp:5854 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 +#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 +#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 msgid "Nozzle" msgstr "Munstycke" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 +#: ../../Firmware/ultralcd.cpp:4621 msgid "Nozzle change" msgstr "Munstycksbyte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:137 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 +#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 +#: ../../Firmware/ultralcd.cpp:4411 msgid "Nozzle d." msgstr "Munst dia." @@ -1386,83 +1389,83 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:40 ../../Firmware/menu.cpp:467 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4214 -#: ../../Firmware/ultralcd.cpp:4225 ../../Firmware/ultralcd.cpp:4226 -#: ../../Firmware/ultralcd.cpp:4228 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4281 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4733 ../../Firmware/ultralcd.cpp:4740 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4763 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5739 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 +#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "Off" msgstr "Av" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1509 +#: ../../Firmware/Marlin_main.cpp:1508 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Gamla inställningar funna. Standard PID, Esteps etc. kommer att ställas in." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:38 ../../Firmware/messages.cpp:127 -#: ../../Firmware/ultralcd.cpp:4214 ../../Firmware/ultralcd.cpp:4225 -#: ../../Firmware/ultralcd.cpp:4226 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4271 -#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4733 -#: ../../Firmware/ultralcd.cpp:4740 ../../Firmware/ultralcd.cpp:4759 -#: ../../Firmware/ultralcd.cpp:4763 ../../Firmware/ultralcd.cpp:5728 -#: ../../Firmware/ultralcd.cpp:5737 ../../Firmware/ultralcd.cpp:5808 -#: ../../Firmware/ultralcd.cpp:7815 ../../Firmware/ultralcd.cpp:7819 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 +#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 +#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 +#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4409 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 msgid "Once" msgstr "En gång" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9674 ../../Firmware/messages.cpp:168 +#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 msgid "PAUSED THERMAL ERROR" msgstr "PAUSAT TERMISKT FEL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:1010 +#: ../../Firmware/ultralcd.cpp:904 msgid "PID cal." msgstr "PID kalibrering." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:1015 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal. finished" msgstr "PID kalibrering klar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4855 +#: ../../Firmware/ultralcd.cpp:4728 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:649 +#: ../../Firmware/ultralcd.cpp:605 msgid "PINDA Heating" msgstr "PINDA uppvärmning" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4954 ../../Firmware/Marlin_main.cpp:5057 -#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:646 -#: ../../Firmware/ultralcd.cpp:4759 ../../Firmware/ultralcd.cpp:4862 +#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 +#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3373 +#: ../../Firmware/ultralcd.cpp:3267 msgid "PINDA calibration failed" msgstr "PINDA-kalibrering misslyckades" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:5134 ../../Firmware/messages.cpp:114 -#: ../../Firmware/ultralcd.cpp:3367 +#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 +#: ../../Firmware/ultralcd.cpp:3261 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1471,7 +1474,7 @@ msgstr "" "menyn Inställningar->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:128 ../../Firmware/mmu2/errors_list.h:167 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 msgid "PULLEY CANNOT MOVE" msgstr "REMSKIVA FASTNAT" @@ -1482,13 +1485,13 @@ msgid "Parking selector" msgstr "Parkerar väljare" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4237 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 msgid "Pause" msgstr "Paus" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5490 -#: ../../Firmware/ultralcd.cpp:5492 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5362 msgid "Pause print" msgstr "Pausa utskrift" @@ -1499,7 +1502,7 @@ msgid "Performing cut" msgstr "Utför skärning" #. MSG_PAPER c=20 r=10 -#: ../../Firmware/Marlin_main.cpp:3303 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." @@ -1508,7 +1511,7 @@ msgstr "" "punkterna. Stäng av skrivaren omedelbart om munstycket rör vid pappret.." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:4127 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1517,27 +1520,27 @@ msgstr "" "starta om skrivaren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6240 +#: ../../Firmware/ultralcd.cpp:6102 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Kontrollera IR-sensorns anslutning, mata ut eventuellt filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6944 +#: ../../Firmware/ultralcd.cpp:6807 msgid "Please check:" msgstr "Kontrollera:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4099 +#: ../../Firmware/ultralcd.cpp:4010 msgid "Please clean heatbed and then press the knob." msgstr "Rengör bädden och tryck sedan på knappen." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3277 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengör munstycket för kalibrering. Klicka när du är klar." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3904 +#: ../../Firmware/ultralcd.cpp:3795 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1545,7 +1548,7 @@ msgstr "" "inladdning.." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3901 +#: ../../Firmware/ultralcd.cpp:3789 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1554,73 +1557,73 @@ msgstr "" "knappen för inladdning." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3824 +#: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Vänligen ladda filament först." #. MSG_CHECK_IDLER c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3578 +#: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Öppna idler och ta bort filamentet manuellt." #. MSG_PLACE_STEEL_SHEET c=20 r=5 -#: ../../Firmware/mesh_bed_calibration.cpp:2795 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:4041 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 +#: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." msgstr "Placera metallskiva på värmebädden." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11529 ../../Firmware/Marlin_main.cpp:11582 +#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 #: ../../Firmware/messages.cpp:78 msgid "Please press the knob to unload filament" msgstr "Vänligen tryck på knappen för att mata ut filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5195 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 msgid "Please pull out filament immediately" msgstr "Vänligen ta ut filamentet omedelbart" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:4036 +#: ../../Firmware/ultralcd.cpp:3938 msgid "Please remove shipping helpers first." msgstr "Vänligen ta bort fraktinsatserna först." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3300 ../../Firmware/Marlin_main.cpp:4918 +#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 #: ../../Firmware/messages.cpp:83 msgid "Please remove steel sheet from heatbed." msgstr "Ta bort metallskivan från värmebädden." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4894 +#: ../../Firmware/Marlin_main.cpp:4730 msgid "Please run XYZ calibration first." msgstr "Utför XYZ-kalibrering först." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6237 +#: ../../Firmware/ultralcd.cpp:6099 msgid "Please unload the filament first, then repeat this action." msgstr "Vänligen mata ut filamentet först och upprepa sedan denna åtgärd." #. MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 -#: ../../Firmware/util.cpp:203 +#: ../../Firmware/util.cpp:217 msgid "Please upgrade." msgstr "Vänligen uppgradera." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3574 ../../Firmware/Marlin_main.cpp:3592 -#: ../../Firmware/Marlin_main.cpp:7954 ../../Firmware/messages.cpp:75 +#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 +#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 #: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 msgid "Please wait" msgstr "Vänligen vänta" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1238 -#: ../../Firmware/ultralcd.cpp:1267 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 +#: ../../Firmware/ultralcd.cpp:1253 msgid "Power failures" msgstr "Strömavbrott" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5485 +#: ../../Firmware/ultralcd.cpp:5355 msgid "Preheat" msgstr "Förvärm" @@ -1630,28 +1633,28 @@ msgid "Preheat the nozzle!" msgstr "Förvärm munstycket!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:2891 -#: ../../Firmware/ultralcd.cpp:3886 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 +#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 msgid "Preheating nozzle. Please wait." msgstr "Förvärmer munstycke. Vänta." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1992 msgid "Preheating to cut" msgstr "Förvärmer för skära" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1991 +#: ../../Firmware/ultralcd.cpp:1989 msgid "Preheating to eject" msgstr "Förvämer för utmatn" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1982 +#: ../../Firmware/ultralcd.cpp:1980 msgid "Preheating to load" msgstr "Förvärmer för laddn" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1987 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to unload" msgstr "Förvärmer for utmatn" @@ -1662,33 +1665,33 @@ msgid "Preparing blade" msgstr "Förbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1802 +#: ../../Firmware/ultralcd.cpp:1806 msgid "Press the knob" msgstr "Tryck på knappen" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11560 +#: ../../Firmware/Marlin_main.cpp:11410 msgid "Press the knob to preheat nozzle and continue." msgstr "Tryck på knappen för att förvärma munstycket och fortsätta." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:845 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 msgid "Print aborted" msgstr "Utskriften avbröts" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1137 -#: ../../Firmware/ultralcd.cpp:7304 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 +#: ../../Firmware/ultralcd.cpp:7161 msgid "Print fan:" msgstr "Utskriftsfläkt:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5518 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 msgid "Print from SD" msgstr "Skriv ut från SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:859 +#: ../../Firmware/ultralcd.cpp:816 msgid "Print paused" msgstr "Utskriften pausad" @@ -1698,35 +1701,35 @@ msgid "Print time" msgstr "Utskriftstid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1704 +#: ../../Firmware/ultralcd.cpp:1690 msgid "Printer IP Addr:" msgstr "Skrivarens IP adr:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1522 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 msgid "" -"Printer has not been calibrated yet. Please follow the manual, chapter First " -"steps, section Calibration flow." +"Printer has not been calibrated yet. Please follow the manual, chapter First" +" steps, section Calibration flow." msgstr "" "Skrivaren har inte kalibrerats ännu. Vänligen följ manualen, kapitel Första " "stegen, avsnitt Kalibreringsflöde." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/util.cpp:289 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 -#: ../../Firmware/util.cpp:295 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" -"Nozzle diameter differs from the G-code. Please check the value in " -"settings. Print cancelled." +"Nozzle diameter differs from the G-code. Please check the value in settings." +" Print cancelled." msgstr "" "Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i " "inställningarna. Utskriften avbröts." #. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:210 ../../Firmware/mmu2/errors_list.h:250 +#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Remskivans motor stannade. Se till att remskivan kan röra sig och " @@ -1739,70 +1742,65 @@ msgid "Pushing filament" msgstr "Pressar filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:157 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 msgid "QUEUE FULL" msgstr "KÖ FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4763 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2728 msgid "Rear side [µm]" msgstr "Baksida [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10896 +#: ../../Firmware/Marlin_main.cpp:10762 msgid "Recovering print" msgstr "Återställer utskrift" #. MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: ../../Firmware/Marlin_main.cpp:3458 +#: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Ta bort det gamla filamentet och tryck på knappen för att börja ladda nytt " "filament." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5409 +#: ../../Firmware/ultralcd.cpp:5279 msgid "Rename" msgstr "Döp om" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:280 +#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"Begärt filamentverktyg är inte tillgängligt på denna hårdvara. Kontrollera G-" -"codeen för verktygsindex utanför intervallet (T0-T4)." +"Begärt filamentverktyg är inte tillgängligt på denna hårdvara. Kontrollera " +"G-codeen för verktygsindex utanför intervallet (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2747 -#: ../../Firmware/ultralcd.cpp:5410 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:5280 msgid "Reset" msgstr "Återställ" -#. MSG_BTN_RESTART_MMU c=9 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:307 -msgid "Reset MMU" -msgstr "Reset MMU" - #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4859 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Reset XYZ calibr." msgstr "Återställ XYZ-kal." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:644 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5504 ../../Firmware/ultralcd.cpp:5506 +#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 +#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 msgid "Resume print" msgstr "Återuppta utskrift" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:657 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 msgid "Resuming print" msgstr "Återupptar utskrift" @@ -1813,7 +1811,7 @@ msgid "Retract from FINDA" msgstr "Dra in från FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:305 +#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 msgid "Retry" msgstr "Igen" @@ -1829,12 +1827,12 @@ msgid "Right" msgstr "Höger" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2744 +#: ../../Firmware/ultralcd.cpp:2726 msgid "Right side[µm]" msgstr "Höger sida[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3846 +#: ../../Firmware/ultralcd.cpp:3738 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1843,70 +1841,65 @@ msgstr "" "börja om från början. Fortsätta?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:139 ../../Firmware/ultralcd.cpp:4775 -#: ../../Firmware/ultralcd.cpp:4777 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/ultralcd.cpp:4647 msgid "SD card" msgstr "SD-kort" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:131 ../../Firmware/mmu2/errors_list.h:169 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 msgid "SELECTOR CANNOT HOME" msgstr "VÄLJARE FASTNAT" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:130 ../../Firmware/mmu2/errors_list.h:170 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 msgid "SELECTOR CANNOT MOVE" msgstr "VÄLJARE FASTNAT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9703 ../../Firmware/messages.cpp:112 +#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 msgid "STOPPED." msgstr "STOPPAD." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/Marlin_main.cpp:3305 -#: ../../Firmware/mesh_bed_calibration.cpp:2233 ../../Firmware/messages.cpp:40 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Söker efter kalibreringspunkt för bädden" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5402 +#: ../../Firmware/ultralcd.cpp:5272 msgid "Select" msgstr "Välj" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3921 +#: ../../Firmware/ultralcd.cpp:3812 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" "Välj ett filament för första lagrets kalibrering och välj det i skärmmenyn." -#. MSG_SELECT_EXTRUDER c=20 -#: ../../Firmware/Marlin_main.cpp:3516 ../../Firmware/Tcodes.cpp:35 -#: ../../Firmware/Tcodes.cpp:51 ../../Firmware/messages.cpp:52 -msgid "Select extruder:" -msgstr "Välj extruder:" - #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Tcodes.cpp:33 ../../Firmware/messages.cpp:53 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 +#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3685 msgid "Select filament:" msgstr "Välj filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3639 -#: ../../Firmware/ultralcd.cpp:4770 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 +#: ../../Firmware/ultralcd.cpp:4640 msgid "Select language" msgstr "Välj språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:3984 msgid "Select nozzle preheat temperature which matches your material." msgstr "Välj munstycksförvärmningstemperatur som passar ditt material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3926 +#: ../../Firmware/ultralcd.cpp:3817 msgid "Select temperature which matches your material." msgstr "Välj temperatur som passar ditt material." @@ -1917,57 +1910,57 @@ msgid "Selecting fil. slot" msgstr "Välj fil. spår" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6504 +#: ../../Firmware/ultralcd.cpp:6367 msgid "Self test OK" msgstr "Självtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6277 +#: ../../Firmware/ultralcd.cpp:6139 msgid "Self test start" msgstr "Självteststart" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4846 +#: ../../Firmware/ultralcd.cpp:4719 msgid "Selftest" msgstr "Självtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6943 +#: ../../Firmware/ultralcd.cpp:6806 msgid "Selftest error!" msgstr "Självtestfel!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6508 -#: ../../Firmware/ultralcd.cpp:7030 ../../Firmware/ultralcd.cpp:7294 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 msgid "Selftest failed" msgstr "Självtestet felade" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1541 +#: ../../Firmware/Marlin_main.cpp:1523 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Självtest kommer att utföras för att kalibrera exakt sensorlös hemposition." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1702 msgid "Sensor info" msgstr "Sensorinfo" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6244 +#: ../../Firmware/ultralcd.cpp:6106 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifierad, ta bort filamentet nu." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2764 +#: ../../Firmware/ultralcd.cpp:2746 msgid "Set temperature:" msgstr "Sätt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3497 -#: ../../Firmware/ultralcd.cpp:3656 ../../Firmware/ultralcd.cpp:4157 -#: ../../Firmware/ultralcd.cpp:5567 ../../Firmware/ultralcd.cpp:5799 -#: ../../Firmware/ultralcd.cpp:5852 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 +#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 +#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 +#: ../../Firmware/ultralcd.cpp:5722 msgid "Settings" msgstr "Inställningar" @@ -1977,13 +1970,13 @@ msgid "Severe skew" msgstr "Hög skevhet" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:209 ../../Firmware/menu.cpp:221 -#: ../../Firmware/messages.cpp:64 +#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 +#: ../../Firmware/messages.cpp:63 msgid "Sheet" msgstr "Skiva" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3784 +#: ../../Firmware/ultralcd.cpp:3675 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1996,13 +1989,13 @@ msgstr "" "%cÅterställ" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4857 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Show end stops" msgstr "Visa ändlägen" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4348 -#: ../../Firmware/ultralcd.cpp:4412 ../../Firmware/ultralcd.cpp:5750 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 +#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 msgid "Silent" msgstr "Tyst" @@ -2012,7 +2005,7 @@ msgid "Slight skew" msgstr "Låg skevhet" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:818 +#: ../../Firmware/cardreader.cpp:816 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2021,170 +2014,163 @@ msgstr "" "sortering är 100." #. MSG_ZLEVELING_ENFORCED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3049 +#: ../../Firmware/Marlin_main.cpp:3037 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Ett problem har uppstått, Z-nivellering utförs..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:140 ../../Firmware/ultralcd.cpp:4780 -#: ../../Firmware/ultralcd.cpp:4781 ../../Firmware/ultralcd.cpp:4782 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 msgid "Sort" msgstr "Sortera" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:862 ../../Firmware/cardreader.cpp:929 +#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 #: ../../Firmware/messages.cpp:100 msgid "Sorting files" msgstr "Sorterar filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4406 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4415 ../../Firmware/ultralcd.cpp:4418 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 +#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 +#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 msgid "Sound" msgstr "Ljud" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5705 +#: ../../Firmware/ultralcd.cpp:5579 msgid "Speed" msgstr "Fart" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7146 -#: ../../Firmware/ultralcd.cpp:7161 ../../Firmware/ultralcd.cpp:7169 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 +#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 msgid "Spinning" msgstr "Rotation" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4907 +#: ../../Firmware/Marlin_main.cpp:4743 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil omgivningstemperatur 21-26C krävs samt ett styvt stativ." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5572 +#: ../../Firmware/ultralcd.cpp:5446 msgid "Statistics" msgstr "Statistik" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4325 -#: ../../Firmware/ultralcd.cpp:4369 ../../Firmware/ultralcd.cpp:5742 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 +#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 msgid "Stealth" msgstr "Tyst" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4684 -#: ../../Firmware/ultralcd.cpp:5399 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 +#: ../../Firmware/ultralcd.cpp:5269 msgid "Steel sheets" msgstr "Metallskivor" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 msgid "Stop" msgstr "Stopp" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:5511 -#: ../../Firmware/ultralcd.cpp:5978 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Stop print" msgstr "Stoppa utskriften" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4455 -#: ../../Firmware/ultralcd.cpp:4537 ../../Firmware/ultralcd.cpp:4576 -#: ../../Firmware/ultralcd.cpp:4617 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 +#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5581 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:7002 +#: ../../Firmware/ultralcd.cpp:6865 msgid "Swapped" msgstr "Utbytt" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:170 ../../Firmware/temperature.cpp:2440 +#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 msgid "THERMAL ANOMALY" msgstr "TERMISK ANOMALI" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:179 -#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:181 +#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 +#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER FEL" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:182 -#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 +#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:149 ../../Firmware/mmu2/errors_list.h:188 -#: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 +#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER KORTSLUTN" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:176 -#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 +#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 msgid "TMC OVERHEAT ERROR" msgstr "TMC ÖVERHETTNINGSFEL" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:185 -#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 +#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERSPÄNNINGFEL" #. 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 "Termisk modell kal. tar ca. 12 min. Kolla\nprusa.io/tm-cal" +#: ../../Firmware/ultralcd.cpp:3965 +msgid "" +"Thermal model cal. takes approx. 12 mins. See\n" +"prusa.io/tm-cal" +msgstr "" +"Termisk modell kal. tar ca. 12 min. Kolla\n" +"prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404 -#: ../../Firmware/messages.cpp:170 +#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 msgid "Thermal model not calibrated yet." msgstr "Termisk-modellen är inte kalibrerad ännu." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4586 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1722 +#: ../../Firmware/ultralcd.cpp:1708 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2.cpp:444 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 msgid "Testing filament" msgstr "Testar filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:215 ../../Firmware/mmu2/errors_list.h:254 +#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Idlern kan inte finna hemposition. Kontrollera om det finns något som " "blockerar dess rörelse." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 -#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:282 -msgid "" -"The MMU unit reports its FW version incompatible with the printer's " -"firmware. Make sure the MMU firmware is up to date." -msgstr "" -"MMU-enheten rapporterar att FW-versionen är inkompatibelmed din skrivare. " -"Säkerställ att MMU-firmwaren är aktuell." - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:212 ../../Firmware/mmu2/errors_list.h:252 +#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2192,7 +2178,7 @@ msgstr "" "blockerar dess rörelse." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3929 +#: ../../Firmware/ultralcd.cpp:3820 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2202,7 +2188,7 @@ msgstr "" "optimal höjd. Kontrollera med bilderna i handboken (Kalibreringskapitlet)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: ../../Firmware/Marlin_main.cpp:1535 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2211,24 +2197,24 @@ msgstr "" "kap Första stegen, avs Kalibreringsflöde." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:141 ../../Firmware/ultralcd.cpp:4780 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 msgid "Time" msgstr "Tid" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5837 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1160 -#: ../../Firmware/ultralcd.cpp:1293 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 +#: ../../Firmware/ultralcd.cpp:1279 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1207 -#: ../../Firmware/ultralcd.cpp:1237 ../../Firmware/ultralcd.cpp:1323 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 +#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 msgid "Total failures" msgstr "Totala fel" @@ -2243,39 +2229,30 @@ msgid "Total print time" msgstr "Tot utskriftstid" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5483 +#: ../../Firmware/ultralcd.cpp:5353 msgid "Tune" msgstr "Ställ in" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 msgid "UNLOAD MANUALLY" msgstr "LADDA UR MANUELLT" -#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:284 -msgid "" -"Unexpected FINDA reading. Ensure no filament is under FINDA and the selector " -"is free. Check FINDA connection." -msgstr "" -"Oväntad FINDA-AVläsning. Se till att inget filament är under FINDA ochatt " -"väljaren är fri. Kontrollera FINDA anslutninig." - #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:298 ../../Firmware/mmu2/errors_list.h:308 +#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 msgid "Unload" msgstr "Ladda ur" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:5548 -#: ../../Firmware/ultralcd.cpp:5565 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 +#: ../../Firmware/ultralcd.cpp:5439 msgid "Unload filament" msgstr "Ta bort filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3499 ../../Firmware/messages.cpp:116 +#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5167 +#: ../../Firmware/ultralcd.cpp:5040 msgid "Unloading filament" msgstr "Tar bort filament" @@ -2292,23 +2269,23 @@ msgid "Unloading to pulley" msgstr "Ladd ur t. remskiva" #. MSG_FIL_FAILED c=20 r=5 -#: ../../Firmware/ultralcd.cpp:6247 +#: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifieringen felade, ta bort filamentet, försök igen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1725 +#: ../../Firmware/ultralcd.cpp:1711 msgid "Voltages" msgstr "Spänning" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:134 ../../Firmware/mmu2/errors_list.h:173 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:175 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 +#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 msgid "WARNING TMC TOO HOT" msgstr "VARNING TMC FÖR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3540 +#: ../../Firmware/ultralcd.cpp:3431 msgid "" "WARNING:\n" "Crash detection\n" @@ -2321,119 +2298,118 @@ msgstr "" "tyst-läge" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:4112 +#: ../../Firmware/Marlin_main.cpp:5265 msgid "Wait for user..." msgstr "Väntar på användare." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2872 +#: ../../Firmware/ultralcd.cpp:2770 msgid "Waiting for PINDA probe cooling" msgstr "Väntar på PINDA-sondens kylning" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2904 +#: ../../Firmware/ultralcd.cpp:2802 msgid "Waiting for nozzle and bed cooling" msgstr "Väntar på munstycks- och bäddkylning" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4534 ../../Firmware/ultralcd.cpp:4573 -#: ../../Firmware/ultralcd.cpp:4614 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 +#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 msgid "Warn" msgstr "Varna" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1501 +#: ../../Firmware/Marlin_main.cpp:1500 msgid "Warning: both printer type and motherboard type changed." msgstr "Varning: både skrivartyp och moderkortstyp har ändrats." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1493 +#: ../../Firmware/Marlin_main.cpp:1492 msgid "Warning: motherboard type changed." msgstr "Varning: moderkortstyp ändrad." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1497 +#: ../../Firmware/Marlin_main.cpp:1496 msgid "Warning: printer type changed." msgstr "Varning: skrivartyp ändrats." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3571 +#: ../../Firmware/Marlin_main.cpp:3529 msgid "Was filament unload successful?" msgstr "Lyckades filamentutmatningen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6954 -#: ../../Firmware/ultralcd.cpp:6958 ../../Firmware/ultralcd.cpp:6978 -#: ../../Firmware/ultralcd.cpp:6984 ../../Firmware/ultralcd.cpp:7008 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 +#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 msgid "Wiring error" msgstr "Kabelfel" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:4710 msgid "Wizard" msgstr "Guide" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4161 +#: ../../Firmware/ultralcd.cpp:4072 msgid "X-correct:" msgstr "X-korrektion:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/ultralcd.cpp:5457 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1714 +#: ../../Firmware/ultralcd.cpp:1700 msgid "XYZ cal. details" msgstr "XYZ kal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3345 +#: ../../Firmware/ultralcd.cpp:3239 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ-kalibrering ok. Skevhet kommer att korrigeras automatiskt." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3342 +#: ../../Firmware/ultralcd.cpp:3236 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibrering ok. X/Y-axlarna är mycket lite skeva. Bra jobbat!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3323 +#: ../../Firmware/ultralcd.cpp:3217 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibrering komprometterad. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3326 +#: ../../Firmware/ultralcd.cpp:3220 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibrering komprometterad. Främre hö kalibreringspunkter kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3305 +#: ../../Firmware/ultralcd.cpp:3199 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibrering felade. Kalibreringspunkter ej funna." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3311 +#: ../../Firmware/ultralcd.cpp:3205 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibrering felade. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3308 -#: ../../Firmware/ultralcd.cpp:3336 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 +#: ../../Firmware/ultralcd.cpp:3230 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibrering felade. Se bruksanvisningen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3314 +#: ../../Firmware/ultralcd.cpp:3208 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibrering felade. Höger främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3339 +#: ../../Firmware/ultralcd.cpp:3233 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibrering ok. X/Y-axlarna ar vinkelräta. Grattis!" @@ -2443,34 +2419,34 @@ msgid "Y distance from min" msgstr "Y avstånd från min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4162 +#: ../../Firmware/ultralcd.cpp:4073 msgid "Y-correct:" msgstr "Y-korrekt:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:2791 ../../Firmware/ultralcd.cpp:3163 -#: ../../Firmware/ultralcd.cpp:4705 ../../Firmware/ultralcd.cpp:5980 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 +#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 +#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:4138 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid återuppta guiden från Kalibrering -> Guide." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4163 +#: ../../Firmware/ultralcd.cpp:4074 msgid "Z-correct:" msgstr "Z-korrekt:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:5807 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 msgid "Z-probe nr." msgstr "Z-sond nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2556 +#: ../../Firmware/ultralcd.cpp:2555 msgid "[0;0] point offset" msgstr "[0;0] punktförskjutn" @@ -2480,38 +2456,122 @@ msgid "and press the knob" msgstr "och tryck på knapp" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1810 +#: ../../Firmware/ultralcd.cpp:1814 msgid "to load filament" msgstr "att ladda filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1818 msgid "to unload filament" msgstr "att ta bort filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1681 +#: ../../Firmware/ultralcd.cpp:1667 msgid "unknown" msgstr "okänd" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:166 +#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 msgid "unknown state" msgstr "okänt stat" #. MSG_BTN_MORE c=8 #. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:301 -#: ../../Firmware/mmu2_error_converter.cpp:167 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 msgid "⏬" msgstr "⏬" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:6068 -#: ../../Firmware/ultralcd.cpp:6071 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 +#: ../../Firmware/ultralcd.cpp:5941 msgid "🔃Refresh" msgstr "🔃Uppdatera" +#. MSG_MMU_POWER_FAILS c=15 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +msgid "MMU power fails" +msgstr "MMU strömavbr." + +#. MSG_TITLE_FILAMENT_EJECTED c=20 +#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +msgid "FILAMENT EJECTED" +msgstr "" + +#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +msgid "" +"Filament detected unexpectedly. Ensure no filament is loaded. Check the " +"sensors and wiring." +msgstr "" + +#. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +msgid "LOAD TO EXTR. FAILED" +msgstr "" + +#. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +msgid "" +"Loading to extruder failed. Inspect the filament tip shape. Refine the " +"sensor calibration, if needed." +msgstr "" + +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 +msgid "MCU UNDERVOLTAGE VCC" +msgstr "" + +#. MSG_MATERIAL_CHANGES c=18 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 +#: ../../Firmware/ultralcd.cpp:1195 +msgid "Material changes" +msgstr "" + +#. MSG_DESC_FILAMENT_EJECTED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +msgid "Remove the ejected filament from the front of the MMU unit." +msgstr "" + +#. MSG_BTN_RESTART_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 +msgid "RstMMU" +msgstr "" + +#. MSG_DESC_INSPECT_FINDA c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +msgid "" +"Selector can't move due to FINDA detecting a filament. Make sure no filament" +" is in selector and FINDA works properly." +msgstr "" + +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +msgid "" +"The MMU unit firmware version incompatible with the printer's FW. Update to " +"version 2.1.9." +msgstr "" + +#~ msgid "Reset MMU" +#~ msgstr "Reset MMU" + +#~ msgid "Select extruder:" +#~ msgstr "Välj extruder:" + +#~ msgid "" +#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "firmware. Make sure the MMU firmware is up to date." +#~ msgstr "" +#~ "MMU-enheten rapporterar att FW-versionen är inkompatibelmed din skrivare. " +#~ "Säkerställ att MMU-firmwaren är aktuell." + +#~ msgid "" +#~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" +#~ " is free. Check FINDA connection." +#~ msgstr "" +#~ "Oväntad FINDA-AVläsning. Se till att inget filament är under FINDA ochatt " +#~ "väljaren är fri. Kontrollera FINDA anslutninig." + #~ msgid "" #~ "Autoloading filament available only when filament sensor is turned on..." #~ msgstr "Autoladdning av fil. är endast möjligt när fil. sensorn är aktiv..." @@ -2564,9 +2624,6 @@ msgstr "🔃Uppdatera" #~ msgid "MMU needs user attention." #~ msgstr "MMU fordrar användarens uppmärksamhet.." -#~ msgid "MMU power fails" -#~ msgstr "MMU strömavbr." - #~ msgid "Please remove filament and then press the knob." #~ msgstr "Ta bort filamentet och tryck sedan på knappen." From 9721a87ef2f308d47ecc02b79249f2e325c621e6 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 15:56:40 +0100 Subject: [PATCH 026/240] Raname `MMU2` message to `MMU` as everywhere --- 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 | 2 +- lang/po/Firmware_sv.po | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 42a562317..f933246ae 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1548,7 +1548,7 @@ void TestPullupCrash() { //! If MMU is connected //! //! @code{.unparsed} -//! | MMU2 connected | c=18 +//! | MMU connected | c=18 //! | FW: 1.0.6-7064523 | //! @endcode //! @@ -1660,7 +1660,7 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); if (MMU2::mmu2.Enabled()) { - MENU_ITEM_BACK_P(_i("MMU2 connected")); ////MSG_MMU_CONNECTED c=18 + MENU_ITEM_BACK_P(_i("MMU connected")); ////MSG_MMU_CONNECTED c=18 MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17 if (((menu_item - 1) == menu_line) && lcd_draw_update) { diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index be0e9c0c1..8cd2504b2 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1152,7 +1152,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 1706495a2..f3ae2c585 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1164,7 +1164,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 pripojeno" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 7a6ccd974..47db88eef 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -1176,7 +1176,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 verbunden" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 6ad97e8fc..b5bcc2e70 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1176,7 +1176,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 conectado" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 9f4b82bee..6b24c81af 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1182,7 +1182,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 connecte" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 66f7aecb4..7ff5ecc16 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -1174,7 +1174,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 spojen" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 2e1efd759..abab2aabb 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -1177,7 +1177,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 csatlakozott" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index a09a88dad..32c64b582 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -1178,7 +1178,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 connessa" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 975ececed..4f8c377f7 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -1179,7 +1179,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 verbonden" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index c8171984e..843a7f8a3 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -1170,7 +1170,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 tilkoblet" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 121130e5d..3c2c3968a 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -1176,7 +1176,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU podlaczone" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 2f2ec152d..f9f63e792 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -1177,7 +1177,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 conectat" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 2d171aa40..9377212af 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1172,7 +1172,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 pripojene" #. MSG_MAGNETS_COMP c=13 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 4ffb610ae..375222578 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -1175,7 +1175,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU2 connected" +msgid "MMU connected" msgstr "MMU2 ansluten" #. MSG_MAGNETS_COMP c=13 From 97a969c49564d615db952a9b105dbd9859cc2db6 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 17:40:29 +0100 Subject: [PATCH 027/240] Add missing translations Part 1 --- lang/po/Firmware_cs.po | 19 ++++++++++++++----- lang/po/Firmware_de.po | 19 ++++++++++++++----- lang/po/Firmware_es.po | 24 ++++++++++++++++-------- lang/po/Firmware_fr.po | 18 +++++++++++++----- lang/po/Firmware_hr.po | 18 +++++++++++++----- lang/po/Firmware_hu.po | 16 ++++++++++++---- lang/po/Firmware_it.po | 18 +++++++++++++----- lang/po/Firmware_nl.po | 18 +++++++++++++----- lang/po/Firmware_no.po | 18 +++++++++++++----- lang/po/Firmware_pl.po | 16 ++++++++++++---- lang/po/Firmware_ro.po | 16 ++++++++++++---- lang/po/Firmware_sk.po | 15 +++++++++++---- lang/po/Firmware_sv.po | 18 +++++++++++++----- 13 files changed, 169 insertions(+), 64 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index f3ae2c585..6180a2361 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -935,7 +935,7 @@ msgstr "CHYBA POHYBU IDLERU" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "KONTROLA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1074,7 +1074,7 @@ msgstr "Zavest do trysky" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Zatěžovací test" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2479,12 +2479,12 @@ msgstr "MMU vyp. proudu" #: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" -msgstr "" +msgstr "Vysunutí z MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT VLÁKNO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2492,6 +2492,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Vlákno bylo neočekávaně zjištěno. Ujistěte se, že není vloženo žádné vlákno." +" Zkontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2504,6 +2506,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Načítání do extrudéru se nezdařilo. Zkontrolujte tvar špičky vlákna. V" +" případě potřeby upřesněte kalibraci snímače." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2519,7 +2523,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Odstraňte vysunuté filament z přední části jednotky MMU." + #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2532,6 +2537,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selektor se nemůže pohybovat, protože FINDA detekuje vlákno. Ujistěte se, že" +" ve voliči není žádné vlákno a FINDA funguje správně." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2539,6 +2546,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Verze firmwaru jednotky MMU není kompatibilní s FW tiskárny. Aktualizujte na" +" verzi 2.1.9." #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 47db88eef..a5d55d32f 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -944,7 +944,7 @@ msgstr "SPANNROL. SITZT FEST" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "INSPIZIERE FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1085,7 +1085,7 @@ msgstr "In Düse laden" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Lade Filament Test" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2506,12 +2506,12 @@ msgstr "MMU Netzfehler" #: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" -msgstr "" +msgstr "Aus MMU auswerf." #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT AUSGEWORFEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2519,6 +2519,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament unerwartet erkannt. Stellen Sie sicher, dass kein Filament geladen" +" ist. Überprüfen Sie die Sensoren und die Verkabelung." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2530,7 +2532,10 @@ msgstr "" msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." + msgstr "" +"Laden in den Extruder fehlgeschlagen. Überprüfe die Form der" +" Filamentspitze. Verfeiner die Sensorkalibrierung, falls erforderlich." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2546,7 +2551,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU-Einheit." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2559,6 +2564,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selektor kann sich nicht bewegen, da FINDA Fil. erkennt wird. Stelle sicher," +" dass sich kein Fil. im Selektor befindet und FINDA ricchtig funktioniert." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2566,6 +2573,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Die Firmware-Version der MMU-Einheit ist mit der FW des Druckers nicht kompatibel." +" Update auf Version 2.1.9." #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index b5bcc2e70..050770368 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -427,7 +427,7 @@ msgstr "Oscuro" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Desactiva" +msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -809,7 +809,7 @@ msgstr "Vents. front/izqui" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" -msgstr "Codigo G laminado para un nivel diferente. Continuar?" +msgstr "Codigo G laminado para un nivel dif. Continuar?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 @@ -945,7 +945,7 @@ msgstr "TENSOR: ERROR MOV." #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "INSPECCIONAR FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1086,7 +1086,7 @@ msgstr "Cargar a boquilla" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Prueba de carga" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -1782,8 +1782,8 @@ msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"El filamento solicitado no está disponible en este hardware. Revise el " -"código G para verificar si el índice de herramienta está fuera de rango " +"El fil. solicitado no está disponible en este hardware. Revise el " +"código G para si el índice de herramienta está fuera de rango " "(T0-T4)." #. MSG_RESET c=14 @@ -2509,7 +2509,7 @@ msgstr "Fallo red MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENTO EXPULSADO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2517,6 +2517,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filamento detectado inesperadamente. Asegúrese de que no haya ningún filamento" +" cargado. Compruebe los sensores y el cableado." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2529,6 +2531,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Error al cargar en la extrusora. Inspeccione la forma de la punta del" +" filamento. Refine la calibración del sensor, si es necesario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2544,7 +2548,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Retire el filamento expulsado de la parte frontal de la unidad MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2557,6 +2561,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"El selector no se puede mover debido a que FINDA detecta un filamento. Asegúrese" +" de que no haya fil. en el selector y que FINDA funcione correctamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2564,6 +2570,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"La versión de firmware de la unidad MMU es incompatible con el FW de la" +" impresora. Actualizar a la versión 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 6b24c81af..0bf798b30 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -813,7 +813,7 @@ msgstr "Ventilos avt/gauche" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 #: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 msgid "G-code sliced for a different level. Continue?" -msgstr "Le G-code a ete prepare pour un niveau different. Continuer?" +msgstr "G-code a ete prepare pour un niveau diff. Continuer?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 @@ -951,7 +951,7 @@ msgstr "ECHEC MOUV.T IDLER" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "INSPECTER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1092,7 +1092,7 @@ msgstr "Charger la buse" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Essai de charge." #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2520,7 +2520,7 @@ msgstr "Def. alim. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT ÉJECTÉ" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2528,6 +2528,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament détecté de manière inattendue. Assurez-vous qu'aucun filament n'est" +" chargé. Vérifiez les capteurs et le câblage." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2540,6 +2542,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Le chargement dans l'extrudeuse a échoué. Inspectez la forme de la pointe" +" du filament. Affiner l'étalonnage du capteur, si nécessaire." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2555,7 +2559,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Retirez le filament éjecté de l'avant de l'unité MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2568,6 +2572,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Le sélecteur ne peut pas bouger car FINDA détecte un filament. Assurez-vous" +" qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2575,6 +2581,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour" +" vers la version 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 7ff5ecc16..901829779 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -424,7 +424,7 @@ msgstr "Tamno" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Onemoguci" +msgstr "Onemogu." #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -944,7 +944,7 @@ msgstr "KLIZAC NIJE POMAKNUT" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "PREGLED FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1084,7 +1084,7 @@ msgstr "Punjenje u mlazn" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Punjenje test" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2501,7 +2501,7 @@ msgstr "Neusp. MMU nap" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT IZBAČEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2509,6 +2509,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Neočekivano detektirana nit. Uvjerite se da nema niti jedne niti. Provjerite" +" senzore i ožičenje." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2521,6 +2523,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Učitavanje u ekstruder nije uspjelo. Provjerite oblik vrha žarne niti." +" Poboljšajte kalibraciju senzora, ako je potrebno." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2536,7 +2540,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Uklonite izbačenu nit s prednje strane MMU jedinice." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2549,6 +2553,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selektor se ne može pomaknuti jer FINDA otkriva nit. Uvjerite se da niti" +" jedna nit nije u selektoru i da FINDA radi ispravno." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2556,6 +2562,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Verzija firmware-a MMU jedinice nekompatibilna s FW-om pisača. Ažuriranje" +" na verziju 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index abab2aabb..bc661175c 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -946,7 +946,7 @@ msgstr "GORGO NEM MOZOG" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "ELLENŐRIZZE A FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1087,7 +1087,7 @@ msgstr "Betolt. fuvokahoz" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Betöltési teszt" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2506,7 +2506,7 @@ msgstr "MMU tap hibak" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT KIADVA" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2514,6 +2514,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Az izzószál váratlanul észlelve. Győződjön meg arról, hogy nincs izzószál" +" betöltve. Ellenőrizze az érzékelőket és a vezetékeket." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2526,6 +2528,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Az extruderbe való betöltés nem sikerült. Ellenőrizze az fil. hegyének" +" alakját. Ha szükséges, finomítsa az érzékelő kalibrálását." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2541,7 +2545,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Távolítsa el a kilökött izzószálat az MMU egység elejéről." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2554,6 +2558,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"A választó nem tud mozogni, mert a FINDA fil. észlelt. Győződjön meg arról," +" hogy nincs fil. a választóban, és a FINDA megfelelően működik." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2561,6 +2567,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Az MMU egység firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés" +" a 2.1.9-es verzióra." #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 32c64b582..11ee03407 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -429,7 +429,7 @@ msgstr "Scuro" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Disattiva" +msgstr "Disatt." #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -948,7 +948,7 @@ msgstr "IDLER BLOCCATO" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "ISPEZIONA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1088,7 +1088,7 @@ msgstr "Carica ugello" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Prova di carica." #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2507,7 +2507,7 @@ msgstr "Manc. corr. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENTO ESPULSO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2515,6 +2515,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filamento rilevato inaspettatamente. Assicurarsi che non sia caricato alcun" +" filamento. Controllare i sensori e il cablaggio." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2527,6 +2529,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Caricamento nell' estrusore non riuscito. Ispezionare la forma della punta" +" del fil. Affinare la calib. del sensore, se necessario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2542,7 +2546,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Rimuovere il filamento espulso dalla parte anteriore dell'unità MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2555,6 +2559,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Il selettore non può muoversi perché FINDA rileva un fil. Assicurati" +" che nessun fil. sia nel selettore e che FINDA funzioni correttamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2562,6 +2568,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"La versione del firmware dell'unità MMU non è compatibile con il firmware della" +" stampante. Aggiornamento alla versione 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 4f8c377f7..0e38a33b0 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -429,7 +429,7 @@ msgstr "Dim" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Uitschak." +msgstr "Uitschak" #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -949,7 +949,7 @@ msgstr "SPANROL BEWEGT NIET" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "CONTROLEER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1089,7 +1089,7 @@ msgstr "Tot tuit laden" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Ladingstest" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2510,7 +2510,7 @@ msgstr "MMU stroomstor." #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT UITGEWORPEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2518,6 +2518,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament onverwacht gedetecteerd. Zorg ervoor dat er geen filament is geladen." +" Controleer de sensoren en bedrading." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2530,6 +2532,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Laden naar extruder is mislukt. Inspecteer de vorm van de filamenttip." +" Verfijn de sensorkalibratie, indien nodig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2545,7 +2549,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Verwijder het uitgeworpen filament uit de voorkant van de MMU-eenheid." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2558,6 +2562,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selector kan niet bewegen omdat FINDA een filament detecteert. Zorg ervoor" +" dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2565,6 +2571,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"De firmwareversie van de MMU-eenheid is niet compatibel met de firmware van" +" de printer. Update naar versie 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 843a7f8a3..3dfa69613 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -428,7 +428,7 @@ msgstr "Svak" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Deaktiver" +msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -941,7 +941,7 @@ msgstr "IDLER CANNOT MOVE" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "KONTROLLER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1080,7 +1080,7 @@ msgstr "Last til dysen" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Lastetest" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2483,7 +2483,7 @@ msgstr "MMU strøm feil" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT UTSETTET" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2491,6 +2491,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament oppdaget uventet. Pass på at ingen filament er lastet. Sjekk" +" sensorene og ledningene." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2503,6 +2505,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Lasting til ekstruder mislyktes. Inspiser filamentspissens form. Avgrens" +" sensorkalibreringen om nødvendig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2518,7 +2522,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Fjern det utkastede filamentet fra fronten av MMU-enheten." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2531,6 +2535,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Velgeren kan ikke bevege seg på grunn av at FINDA oppdager en filament. Sørg" +" for at ingen fil. er i velgeren og at FINDA fungerer som den skal." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2538,6 +2544,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"MMU-enhetens fastvareversjon er inkompatibel med skriverens FW. Oppdatering" +" til versjon 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 3c2c3968a..bc0d2c79a 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -945,7 +945,7 @@ msgstr "DOCISK NIE RUSZA SIE" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "SPRAWDŹ FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1086,7 +1086,7 @@ msgstr "Zaladuj do dyszy" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Test ładowania" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2502,7 +2502,7 @@ msgstr "Zaniki zas. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "WYSUNIĘTY FILAMENT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2510,6 +2510,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament wykryto nieoczekiwanie. Upewnij się, że nie załadowano filamentu." +" Sprawdź czujniki i okablowanie." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2522,6 +2524,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Ładowanie do ekstrudera nie powiodło się. Sprawdź kształt końcówki filamentu." +" W razie potrzeby doprecyzuj kalibrację czujnika." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2537,7 +2541,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Usuń wyrzucony filament z przodu jednostki MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2550,6 +2554,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selektor nie może się poruszyć, ponieważ program FINDA wykrył żarnik. Upewnij się," +" że w selektorze nie ma filamentu i że FINDA działa prawidłowo." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2557,6 +2563,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Wersja oprogramowania układowego modułu MMU jest niezgodna z oprogramowaniem" +" sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index f9f63e792..2a9f12fa0 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -430,7 +430,7 @@ msgstr "Minim" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Dezactiv." +msgstr "Dezactiv" #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -948,7 +948,7 @@ msgstr "IDLER NU SE MISCA" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "Verifica FINDA" +msgstr "SPRAWDŹ FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -2506,7 +2506,7 @@ msgstr "Err. MMU curent" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT EJECTAT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2514,6 +2514,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament detectat în mod neașteptat. Asigurați-vă că nu este încărcat niciun" +" filament. Verificați senzorii și cablajul." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2526,6 +2528,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Încărcarea în extruder nu a reușit. Inspectați forma vârfului filamentului." +" Rafinați calibrarea senzorului, dacă este necesar." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2541,7 +2545,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Scoateți filamentul ejectat din partea din față a unității MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2554,6 +2558,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selectorul nu se poate mișca deoarece FINDA detectează un filament. Asigurați-vă" +" că nu există filament în selector și că FINDA funcționează corect." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2561,6 +2567,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Versiunea de firmware a unității MMU este incompatibilă cu FW-ul imprimantei." +" Actualizați la versiunea 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 9377212af..fb771601d 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -943,7 +943,7 @@ msgstr "IDLER CANNOT MOVE" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "KONTROLA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1082,7 +1082,7 @@ msgstr "Zaved. do trysky" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Načítavací test" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2490,7 +2490,7 @@ msgstr "MMU vyp. prudu" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT EJECTED" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2498,6 +2498,7 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Neočakávane bolo zistené filament. Uistite sa, že nie je vložené žiadne filament. Skontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2510,6 +2511,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Načítanie do extrudéra zlyhalo. Skontrolujte tvar špičky vlákna. V prípade" +" potreby upravte kalibráciu snímača." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2525,7 +2528,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Odstráňte vysunuté filament z prednej časti jednotky MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2538,6 +2541,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Selektor sa nemôže pohybovať, pretože FINDA zistila vlákno. Uistite sa, že v" +" prepínači nie je žiadne vlákno a FINDA funguje správne." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2545,6 +2550,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"Verzia firmvéru jednotky MMU nekompatibilná s FW tlačiarne. Aktualizácia na" +" verziu 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 375222578..af8ed1957 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -428,7 +428,7 @@ msgstr "Dim" #. MSG_BTN_DISABLE_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 msgid "Disable" -msgstr "Inaktiver" +msgstr "Inaktiv." #. MSG_DISABLE_STEPPERS c=18 #: ../../Firmware/ultralcd.cpp:4591 @@ -944,7 +944,7 @@ msgstr "IDLER KAN EJ FLYTTA" #. MSG_TITLE_INSPECT_FINDA c=20 #: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 msgid "INSPECT FINDA" -msgstr "" +msgstr "KONTROLLERA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 #: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 @@ -1085,7 +1085,7 @@ msgstr "Ladd till munstyck" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "" +msgstr "Laddningstest" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2496,7 +2496,7 @@ msgstr "MMU strömavbr." #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "" +msgstr "FILAMENT UTASTAT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2504,6 +2504,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" +"Filament upptäcktes oväntat. Se till att ingen filament är laddad. Kontrollera" +" sensorerna och kablarna." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2516,6 +2518,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" +"Det gick inte att ladda till extrudern. Inspektera filamentspetsens form." +" Förfina sensorkalibreringen vid behov." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2531,7 +2535,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "" +msgstr "Ta bort den utskjutna filament från framsidan av MMU-enheten." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2544,6 +2548,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" +"Väljaren kan inte röra sig på grund av att FINDA detekterar en filament. Se till" +" att inget glödtråd är i väljaren och att FINDA fungerar korrekt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2551,6 +2557,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" +"MMU-enhetens firmwareversion är inkompatibel med skrivarens FW. Uppdatering" +" till version 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From b9a20d06783a176fac83486a15673fe8560e5950 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 18:10:57 +0100 Subject: [PATCH 028/240] Update translations part 2 --- lang/po/Firmware.pot | 10 +++++----- lang/po/Firmware_cs.po | 5 ++--- lang/po/Firmware_de.po | 16 ++++++++-------- lang/po/Firmware_es.po | 22 +++++++++++----------- lang/po/Firmware_fr.po | 12 ++++++------ lang/po/Firmware_hr.po | 12 ++++++------ lang/po/Firmware_hu.po | 16 ++++++++-------- lang/po/Firmware_it.po | 16 ++++++++-------- lang/po/Firmware_nl.po | 19 ++++++++++--------- lang/po/Firmware_no.po | 12 ++++++------ lang/po/Firmware_pl.po | 12 ++++++------ lang/po/Firmware_ro.po | 13 +++++++------ lang/po/Firmware_sk.po | 11 ++++++----- lang/po/Firmware_sv.po | 16 ++++++++-------- 14 files changed, 97 insertions(+), 95 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 8cd2504b2..d62e9c56e 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1119,6 +1119,11 @@ msgstr "" msgid "MMU SELFTEST FAILED" msgstr "" +#. MSG_MMU_CONNECTED c=18 +#: ../../Firmware/ultralcd.cpp:1658 +msgid "MMU connected" +msgstr "" + #. MSG_MMU_FAILS c=15 #: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 #: ../../Firmware/ultralcd.cpp:1169 @@ -1150,11 +1155,6 @@ msgid "" "persists, contact support." msgstr "" -#. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 -msgid "MMU connected" -msgstr "" - #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 msgid "Magnets comp." diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 6180a2361..bd3d0f7f7 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2506,8 +2506,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Načítání do extrudéru se nezdařilo. Zkontrolujte tvar špičky vlákna. V" -" případě potřeby upřesněte kalibraci snímače." +"Načítání do extrudéru se nezdařilo. Zkontrolujte tvar špičky vlákna. V " +"případě potřeby upřesněte kalibraci snímače." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2525,7 +2525,6 @@ msgstr "" msgid "Remove the ejected filament from the front of the MMU unit." msgstr "Odstraňte vysunuté filament z přední části jednotky MMU." - #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index a5d55d32f..14dca3ba1 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2519,8 +2519,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filament unerwartet erkannt. Stellen Sie sicher, dass kein Filament geladen" -" ist. Überprüfen Sie die Sensoren und die Verkabelung." +"Filament unerwartet erkannt. Stellen Sie sicher, dass kein Filament geladen " +"ist. Überprüfen Sie die Sensoren und die Verkabelung." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2532,10 +2532,9 @@ msgstr "" msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." - msgstr "" -"Laden in den Extruder fehlgeschlagen. Überprüfe die Form der" -" Filamentspitze. Verfeiner die Sensorkalibrierung, falls erforderlich." +"Laden in den Extruder fehlgeschlagen. Überprüfe die Form der Filamentspitze." +" Verfeiner die Sensorkalibrierung, falls erforderlich." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2551,7 +2550,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU-Einheit." +msgstr "" +"Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU-Einheit." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2573,8 +2573,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Die Firmware-Version der MMU-Einheit ist mit der FW des Druckers nicht kompatibel." -" Update auf Version 2.1.9." +"Die Firmware-Version der MMU-Einheit ist mit der FW des Druckers nicht " +"kompatibel. Update auf Version 2.1.9." #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 050770368..790ab7070 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1782,9 +1782,8 @@ msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." msgstr "" -"El fil. solicitado no está disponible en este hardware. Revise el " -"código G para si el índice de herramienta está fuera de rango " -"(T0-T4)." +"El fil. solicitado no está disponible en este hardware. Revise el código G " +"para si el índice de herramienta está fuera de rango (T0-T4)." #. MSG_RESET c=14 #: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 @@ -2517,8 +2516,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filamento detectado inesperadamente. Asegúrese de que no haya ningún filamento" -" cargado. Compruebe los sensores y el cableado." +"Filamento detectado inesperadamente. Asegúrese de que no haya ningún " +"filamento cargado. Compruebe los sensores y el cableado." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2531,8 +2530,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Error al cargar en la extrusora. Inspeccione la forma de la punta del" -" filamento. Refine la calibración del sensor, si es necesario." +"Error al cargar en la extrusora. Inspeccione la forma de la punta del " +"filamento. Refine la calibración del sensor, si es necesario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2561,8 +2560,9 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"El selector no se puede mover debido a que FINDA detecta un filamento. Asegúrese" -" de que no haya fil. en el selector y que FINDA funcione correctamente." +"El selector no se puede mover debido a que FINDA detecta un filamento. " +"Asegúrese de que no haya fil. en el selector y que FINDA funcione " +"correctamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2570,8 +2570,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La versión de firmware de la unidad MMU es incompatible con el FW de la" -" impresora. Actualizar a la versión 2.1.9." +"La versión de firmware de la unidad MMU es incompatible con el FW de la " +"impresora. Actualizar a la versión 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 0bf798b30..b1bcdd562 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2542,8 +2542,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Le chargement dans l'extrudeuse a échoué. Inspectez la forme de la pointe" -" du filament. Affiner l'étalonnage du capteur, si nécessaire." +"Le chargement dans l'extrudeuse a échoué. Inspectez la forme de la pointe du" +" filament. Affiner l'étalonnage du capteur, si nécessaire." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2572,8 +2572,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Le sélecteur ne peut pas bouger car FINDA détecte un filament. Assurez-vous" -" qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." +"Le sélecteur ne peut pas bouger car FINDA détecte un filament. Assurez-vous " +"qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2581,8 +2581,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour" -" vers la version 2.1.9." +"La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " +"vers la version 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 901829779..6c85efc79 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2523,8 +2523,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Učitavanje u ekstruder nije uspjelo. Provjerite oblik vrha žarne niti." -" Poboljšajte kalibraciju senzora, ako je potrebno." +"Učitavanje u ekstruder nije uspjelo. Provjerite oblik vrha žarne niti. " +"Poboljšajte kalibraciju senzora, ako je potrebno." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2553,8 +2553,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selektor se ne može pomaknuti jer FINDA otkriva nit. Uvjerite se da niti" -" jedna nit nije u selektoru i da FINDA radi ispravno." +"Selektor se ne može pomaknuti jer FINDA otkriva nit. Uvjerite se da niti " +"jedna nit nije u selektoru i da FINDA radi ispravno." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2562,8 +2562,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzija firmware-a MMU jedinice nekompatibilna s FW-om pisača. Ažuriranje" -" na verziju 2.1.9." +"Verzija firmware-a MMU jedinice nekompatibilna s FW-om pisača. Ažuriranje na" +" verziju 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index bc661175c..422461653 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2514,8 +2514,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Az izzószál váratlanul észlelve. Győződjön meg arról, hogy nincs izzószál" -" betöltve. Ellenőrizze az érzékelőket és a vezetékeket." +"Az izzószál váratlanul észlelve. Győződjön meg arról, hogy nincs izzószál " +"betöltve. Ellenőrizze az érzékelőket és a vezetékeket." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2528,8 +2528,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Az extruderbe való betöltés nem sikerült. Ellenőrizze az fil. hegyének" -" alakját. Ha szükséges, finomítsa az érzékelő kalibrálását." +"Az extruderbe való betöltés nem sikerült. Ellenőrizze az fil. hegyének " +"alakját. Ha szükséges, finomítsa az érzékelő kalibrálását." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2558,8 +2558,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"A választó nem tud mozogni, mert a FINDA fil. észlelt. Győződjön meg arról," -" hogy nincs fil. a választóban, és a FINDA megfelelően működik." +"A választó nem tud mozogni, mert a FINDA fil. észlelt. Győződjön meg arról, " +"hogy nincs fil. a választóban, és a FINDA megfelelően működik." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2567,8 +2567,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Az MMU egység firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés" -" a 2.1.9-es verzióra." +"Az MMU egység firmware-verziója nem kompatibilis a nyomtató FW-vel. " +"Frissítés a 2.1.9-es verzióra." #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 11ee03407..deb8d11c7 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2515,8 +2515,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filamento rilevato inaspettatamente. Assicurarsi che non sia caricato alcun" -" filamento. Controllare i sensori e il cablaggio." +"Filamento rilevato inaspettatamente. Assicurarsi che non sia caricato alcun " +"filamento. Controllare i sensori e il cablaggio." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2529,8 +2529,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Caricamento nell' estrusore non riuscito. Ispezionare la forma della punta" -" del fil. Affinare la calib. del sensore, se necessario." +"Caricamento nell' estrusore non riuscito. Ispezionare la forma della punta " +"del fil. Affinare la calib. del sensore, se necessario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2559,8 +2559,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Il selettore non può muoversi perché FINDA rileva un fil. Assicurati" -" che nessun fil. sia nel selettore e che FINDA funzioni correttamente." +"Il selettore non può muoversi perché FINDA rileva un fil. Assicurati che " +"nessun fil. sia nel selettore e che FINDA funzioni correttamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2568,8 +2568,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La versione del firmware dell'unità MMU non è compatibile con il firmware della" -" stampante. Aggiornamento alla versione 2.1.9." +"La versione del firmware dell'unità MMU non è compatibile con il firmware " +"della stampante. Aggiornamento alla versione 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 0e38a33b0..f8d2798c7 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2518,8 +2518,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filament onverwacht gedetecteerd. Zorg ervoor dat er geen filament is geladen." -" Controleer de sensoren en bedrading." +"Filament onverwacht gedetecteerd. Zorg ervoor dat er geen filament is " +"geladen. Controleer de sensoren en bedrading." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2532,8 +2532,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Laden naar extruder is mislukt. Inspecteer de vorm van de filamenttip." -" Verfijn de sensorkalibratie, indien nodig." +"Laden naar extruder is mislukt. Inspecteer de vorm van de filamenttip. " +"Verfijn de sensorkalibratie, indien nodig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2549,7 +2549,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Verwijder het uitgeworpen filament uit de voorkant van de MMU-eenheid." +msgstr "" +"Verwijder het uitgeworpen filament uit de voorkant van de MMU-eenheid." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2562,8 +2563,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selector kan niet bewegen omdat FINDA een filament detecteert. Zorg ervoor" -" dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." +"Selector kan niet bewegen omdat FINDA een filament detecteert. Zorg ervoor " +"dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2571,8 +2572,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"De firmwareversie van de MMU-eenheid is niet compatibel met de firmware van" -" de printer. Update naar versie 2.1.9." +"De firmwareversie van de MMU-eenheid is niet compatibel met de firmware van " +"de printer. Update naar versie 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 3dfa69613..0d5961e32 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2491,8 +2491,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filament oppdaget uventet. Pass på at ingen filament er lastet. Sjekk" -" sensorene og ledningene." +"Filament oppdaget uventet. Pass på at ingen filament er lastet. Sjekk " +"sensorene og ledningene." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2505,8 +2505,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Lasting til ekstruder mislyktes. Inspiser filamentspissens form. Avgrens" -" sensorkalibreringen om nødvendig." +"Lasting til ekstruder mislyktes. Inspiser filamentspissens form. Avgrens " +"sensorkalibreringen om nødvendig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2544,8 +2544,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU-enhetens fastvareversjon er inkompatibel med skriverens FW. Oppdatering" -" til versjon 2.1.9." +"MMU-enhetens fastvareversjon er inkompatibel med skriverens FW. Oppdatering " +"til versjon 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index bc0d2c79a..1007ad1bf 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2510,8 +2510,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filament wykryto nieoczekiwanie. Upewnij się, że nie załadowano filamentu." -" Sprawdź czujniki i okablowanie." +"Filament wykryto nieoczekiwanie. Upewnij się, że nie załadowano filamentu. " +"Sprawdź czujniki i okablowanie." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2524,8 +2524,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Ładowanie do ekstrudera nie powiodło się. Sprawdź kształt końcówki filamentu." -" W razie potrzeby doprecyzuj kalibrację czujnika." +"Ładowanie do ekstrudera nie powiodło się. Sprawdź kształt końcówki " +"filamentu. W razie potrzeby doprecyzuj kalibrację czujnika." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2554,8 +2554,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selektor nie może się poruszyć, ponieważ program FINDA wykrył żarnik. Upewnij się," -" że w selektorze nie ma filamentu i że FINDA działa prawidłowo." +"Selektor nie może się poruszyć, ponieważ program FINDA wykrył żarnik. " +"Upewnij się, że w selektorze nie ma filamentu i że FINDA działa prawidłowo." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 2a9f12fa0..a9dac07ce 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2528,8 +2528,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Încărcarea în extruder nu a reușit. Inspectați forma vârfului filamentului." -" Rafinați calibrarea senzorului, dacă este necesar." +"Încărcarea în extruder nu a reușit. Inspectați forma vârfului filamentului. " +"Rafinați calibrarea senzorului, dacă este necesar." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2558,8 +2558,9 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selectorul nu se poate mișca deoarece FINDA detectează un filament. Asigurați-vă" -" că nu există filament în selector și că FINDA funcționează corect." +"Selectorul nu se poate mișca deoarece FINDA detectează un filament. " +"Asigurați-vă că nu există filament în selector și că FINDA funcționează " +"corect." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2567,8 +2568,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Versiunea de firmware a unității MMU este incompatibilă cu FW-ul imprimantei." -" Actualizați la versiunea 2.1.9." +"Versiunea de firmware a unității MMU este incompatibilă cu FW-ul " +"imprimantei. Actualizați la versiunea 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index fb771601d..13800d4c7 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2498,7 +2498,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Neočakávane bolo zistené filament. Uistite sa, že nie je vložené žiadne filament. Skontrolujte snímače a kabeláž." +"Neočakávane bolo zistené filament. Uistite sa, že nie je vložené žiadne " +"filament. Skontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2511,8 +2512,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Načítanie do extrudéra zlyhalo. Skontrolujte tvar špičky vlákna. V prípade" -" potreby upravte kalibráciu snímača." +"Načítanie do extrudéra zlyhalo. Skontrolujte tvar špičky vlákna. V prípade " +"potreby upravte kalibráciu snímača." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2550,8 +2551,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzia firmvéru jednotky MMU nekompatibilná s FW tlačiarne. Aktualizácia na" -" verziu 2.1.9." +"Verzia firmvéru jednotky MMU nekompatibilná s FW tlačiarne. Aktualizácia na " +"verziu 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index af8ed1957..6b75e97a1 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2504,8 +2504,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Filament upptäcktes oväntat. Se till att ingen filament är laddad. Kontrollera" -" sensorerna och kablarna." +"Filament upptäcktes oväntat. Se till att ingen filament är laddad. " +"Kontrollera sensorerna och kablarna." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2518,8 +2518,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Det gick inte att ladda till extrudern. Inspektera filamentspetsens form." -" Förfina sensorkalibreringen vid behov." +"Det gick inte att ladda till extrudern. Inspektera filamentspetsens form. " +"Förfina sensorkalibreringen vid behov." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2548,8 +2548,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Väljaren kan inte röra sig på grund av att FINDA detekterar en filament. Se till" -" att inget glödtråd är i väljaren och att FINDA fungerar korrekt." +"Väljaren kan inte röra sig på grund av att FINDA detekterar en filament. Se " +"till att inget glödtråd är i väljaren och att FINDA fungerar korrekt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2557,8 +2557,8 @@ msgid "" "The MMU unit firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU-enhetens firmwareversion är inkompatibel med skrivarens FW. Uppdatering" -" till version 2.1.9." +"MMU-enhetens firmwareversion är inkompatibel med skrivarens FW. Uppdatering " +"till version 2.1.9." #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 235c4ae943828e8b56db73c23360a7ccb3de3a1d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 18:32:46 +0100 Subject: [PATCH 029/240] Do not `MSG_BTN_MORE` translate --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_error_converter.cpp | 2 +- Firmware/mmu2_reporting.cpp | 3 +-- lang/po/Firmware.pot | 17 +++++------------ lang/po/Firmware_cs.po | 20 ++++++++------------ lang/po/Firmware_de.po | 20 ++++++++------------ lang/po/Firmware_es.po | 20 ++++++++------------ lang/po/Firmware_fr.po | 20 ++++++++------------ lang/po/Firmware_hr.po | 20 ++++++++------------ lang/po/Firmware_hu.po | 20 ++++++++------------ lang/po/Firmware_it.po | 20 ++++++++------------ lang/po/Firmware_nl.po | 20 ++++++++------------ lang/po/Firmware_no.po | 20 ++++++++------------ lang/po/Firmware_pl.po | 20 ++++++++------------ lang/po/Firmware_ro.po | 20 ++++++++------------ lang/po/Firmware_sk.po | 20 ++++++++------------ lang/po/Firmware_sv.po | 20 ++++++++------------ 17 files changed, 112 insertions(+), 172 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index b51b89cba..5a7c35630 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -332,7 +332,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("RstMMU"); ////MSG_BTN static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 -static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8 //@todo convert to PROGMEM_N1 +static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 15c66bb83..0f9975026 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){ } const char * PrusaErrorButtonMore(){ - return _R(MSG_BTN_MORE);//@todo convert to PROGMEM_N1 + return MSG_BTN_MORE; } struct ResetOnExit { diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 46d2c97aa..2fe63f46b 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -77,8 +77,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // Render the choices - //@todo convert MSG_BTN_MORE to PROGMEM_N1 - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : PrusaErrorButtonMore()); } void ReportErrorHookSensorLineRender(){ diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index d62e9c56e..079aea90e 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -384,7 +384,7 @@ msgid "" msgstr "" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "" @@ -478,7 +478,7 @@ msgid "ERROR:" msgstr "" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "" @@ -1059,7 +1059,7 @@ msgstr "" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "" @@ -1109,7 +1109,7 @@ msgid "MMU NOT RESPONDING" msgstr "" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "" @@ -2111,7 +2111,7 @@ msgid "Temperatures" msgstr "" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "" @@ -2435,13 +2435,6 @@ msgstr "" msgid "unknown state" msgstr "" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index bd3d0f7f7..0dace97f7 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -403,7 +403,7 @@ msgstr "" "Normal modu" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Ustrihnout" @@ -1084,7 +1084,7 @@ msgstr "Cisteni barvy" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Zavadeni filamentu" @@ -1122,7 +1122,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEODPOVIDA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU opakovani: Obnova teploty..." @@ -2137,7 +2137,7 @@ msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Testovani filamentu" @@ -2457,13 +2457,6 @@ msgstr "neznamy" msgid "unknown state" msgstr "neznamy stav" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2476,7 +2469,7 @@ msgid "MMU power fails" msgstr "MMU vyp. proudu" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Vysunutí z MMU" @@ -2548,6 +2541,9 @@ msgstr "" "Verze firmwaru jednotky MMU není kompatibilní s FW tiskárny. Aktualizujte na" " verzi 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 14dca3ba1..c0322b2f9 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -406,7 +406,7 @@ msgstr "" "genutzt werden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Fil. schneiden" @@ -1095,7 +1095,7 @@ msgstr "Lade Farbe" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Filament lädt" @@ -1133,7 +1133,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGIERT NICHT" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU-Neuversuch: Wiederherstelle die Temperatur..." @@ -2158,7 +2158,7 @@ msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Teste filament" @@ -2484,13 +2484,6 @@ msgstr "unbekannt" msgid "unknown state" msgstr "Status unbekannt" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2503,7 +2496,7 @@ msgid "MMU power fails" msgstr "MMU Netzfehler" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Aus MMU auswerf." @@ -2576,6 +2569,9 @@ msgstr "" "Die Firmware-Version der MMU-Einheit ist mit der FW des Druckers nicht " "kompatibel. Update auf Version 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 790ab7070..1ecf95c0d 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -403,7 +403,7 @@ msgstr "" "Modo normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Cortar filament" @@ -500,7 +500,7 @@ msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Expulsar de MMU" @@ -1096,7 +1096,7 @@ msgstr "Cambiando color" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Introduciendo filam." @@ -1134,7 +1134,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NO RESPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Reintento: Restaurando temperatura..." @@ -2165,7 +2165,7 @@ msgid "Temperatures" msgstr "Temperaturas" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Probando filamento" @@ -2487,13 +2487,6 @@ msgstr "desconocido" msgid "unknown state" msgstr "estado desconocido" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2573,6 +2566,9 @@ msgstr "" "La versión de firmware de la unidad MMU es incompatible con el FW de la " "impresora. Actualizar a la versión 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b1bcdd562..605bdbba9 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -406,7 +406,7 @@ msgstr "" "mode Normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Coupe filament" @@ -504,7 +504,7 @@ msgid "ERROR:" msgstr "ERREUR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Éjecter du MMU" @@ -1102,7 +1102,7 @@ msgstr "Charg. de la couleur" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Chargement du fil." @@ -1140,7 +1140,7 @@ msgid "MMU NOT RESPONDING" msgstr "LE MMU NE REPOND PAS" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "Nouvelle tentative MMU: Restauration de la temperature..." @@ -2168,7 +2168,7 @@ msgid "Temperatures" msgstr "Temperatures" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Test du filament" @@ -2499,13 +2499,6 @@ msgstr "inconnu" msgid "unknown state" msgstr "Etat inconnu" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2584,6 +2577,9 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 6c85efc79..8054e85c6 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -400,7 +400,7 @@ msgid "" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Odrezite fil." @@ -499,7 +499,7 @@ msgid "ERROR:" msgstr "POGRESKA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Izbaci iz MMU" @@ -1094,7 +1094,7 @@ msgstr "Ucitavanje boje" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Punjenje filamenta" @@ -1132,7 +1132,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NE ODGOVARA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ponovni pokusaj: Vracanje temperature..." @@ -2159,7 +2159,7 @@ msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Testiram filament" @@ -2480,13 +2480,6 @@ msgstr "nepoznato" msgid "unknown state" msgstr "nepoznato stanje" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2565,6 +2558,9 @@ msgstr "" "Verzija firmware-a MMU jedinice nekompatibilna s FW-om pisača. Ažuriranje na" " verziju 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 422461653..b27d4c136 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -403,7 +403,7 @@ msgstr "" "kapcsolhato be" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Filament vagasa" @@ -502,7 +502,7 @@ msgid "ERROR:" msgstr "HIBA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Kiadás az MMUból" @@ -1097,7 +1097,7 @@ msgstr "Szin tisztitasa" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Filament betoltese" @@ -1135,7 +1135,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEM VALASZOL" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ujra: Homerseklet visszaallitasa" @@ -2159,7 +2159,7 @@ msgid "Temperatures" msgstr "Homersekletek" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Filament tesztelese" @@ -2485,13 +2485,6 @@ msgstr "ismeretlen" msgid "unknown state" msgstr "ismeretlen allapot" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2570,6 +2563,9 @@ msgstr "" "Az MMU egység firmware-verziója nem kompatibilis a nyomtató FW-vel. " "Frissítés a 2.1.9-es verzióra." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index deb8d11c7..98d9deef5 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -405,7 +405,7 @@ msgstr "" "in Modalita normale" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Taglia filamento" @@ -503,7 +503,7 @@ msgid "ERROR:" msgstr "ERRORE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Espelli da MMU" @@ -1098,7 +1098,7 @@ msgstr "Caricando colore" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Caricando filamento" @@ -1136,7 +1136,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NON RISPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Riprova. Ripristino temperatura..." @@ -2162,7 +2162,7 @@ msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Provo il filamento" @@ -2486,13 +2486,6 @@ msgstr "sconosciuto" msgid "unknown state" msgstr "stato sconosciuto" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2571,6 +2564,9 @@ msgstr "" "La versione del firmware dell'unità MMU non è compatibile con il firmware " "della stampante. Aggiornamento alla versione 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index f8d2798c7..06517c3f6 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -405,7 +405,7 @@ msgstr "" "gebruikt worden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Fil. knippen" @@ -504,7 +504,7 @@ msgid "ERROR:" msgstr "FOUT:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Uitwerp. van MMU" @@ -1099,7 +1099,7 @@ msgstr "Laden kleur" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laden filament" @@ -1137,7 +1137,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGEERT NIET" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: Temperatuur herstellen..." @@ -2168,7 +2168,7 @@ msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Teste filament" @@ -2489,13 +2489,6 @@ msgstr "onbekend" msgid "unknown state" msgstr "Status onbekend" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2575,6 +2568,9 @@ msgstr "" "De firmwareversie van de MMU-eenheid is niet compatibel met de firmware van " "de printer. Update naar versie 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 0d5961e32..a7545a20b 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -404,7 +404,7 @@ msgstr "" "Normal modus" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Kutt filament" @@ -502,7 +502,7 @@ msgid "ERROR:" msgstr "FEIL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Løs ut fra MMU" @@ -1090,7 +1090,7 @@ msgstr "Laster farge" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laster filament" @@ -1128,7 +1128,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARER IKKE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: gjenoppretter temperatur..." @@ -2144,7 +2144,7 @@ msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Tester filament" @@ -2462,13 +2462,6 @@ msgstr "ukjent" msgid "unknown state" msgstr "ukjent tilstand" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2547,6 +2540,9 @@ msgstr "" "MMU-enhetens fastvareversjon er inkompatibel med skriverens FW. Oppdatering " "til versjon 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 1007ad1bf..2f72f9d26 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -405,7 +405,7 @@ msgstr "" "trybie Normalnym" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Ciecie filamentu" @@ -503,7 +503,7 @@ msgid "ERROR:" msgstr "BLAD:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Wysun z MMU" @@ -1096,7 +1096,7 @@ msgstr "Czyszcz. koloru" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laduje filament" @@ -1134,7 +1134,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NIE ODPOWIADA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU wznaw. Nagrzewanie..." @@ -2157,7 +2157,7 @@ msgid "Temperatures" msgstr "Temperatury" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Test filamentu" @@ -2481,13 +2481,6 @@ msgstr "nieznane" msgid "unknown state" msgstr "Stan nieznany" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2566,6 +2559,9 @@ msgstr "" "Wersja oprogramowania układowego modułu MMU jest niezgodna z oprogramowaniem" " sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index a9dac07ce..6d1a9d5b7 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -406,7 +406,7 @@ msgstr "" "doar in modul normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Taie filamentul" @@ -504,7 +504,7 @@ msgid "ERROR:" msgstr "EROARE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Scoateți din MMU" @@ -1097,7 +1097,7 @@ msgstr "Incarcare culoare" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Incarcare filament" @@ -1135,7 +1135,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NU RASPUNDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Restabilirea temperaturii..." @@ -2160,7 +2160,7 @@ msgid "Temperatures" msgstr "Temperaturi" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Testare filament" @@ -2485,13 +2485,6 @@ msgstr "necunoscut" msgid "unknown state" msgstr "vers. necunoscuta" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2571,6 +2564,9 @@ msgstr "" "Versiunea de firmware a unității MMU este incompatibilă cu FW-ul " "imprimantei. Actualizați la versiunea 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 13800d4c7..37cbe1636 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -403,7 +403,7 @@ msgstr "" "Normalnom rezime" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Odstrihnut filam." @@ -501,7 +501,7 @@ msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Vysunúť z MMU" @@ -1092,7 +1092,7 @@ msgstr "Cistenie farby" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Zavedenie filamentu" @@ -1130,7 +1130,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NOT RESPONDING" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Obnovenie teploty..." @@ -2150,7 +2150,7 @@ msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Kontrola filamentu" @@ -2469,13 +2469,6 @@ msgstr "neznamy" msgid "unknown state" msgstr "neznamy stav" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2554,6 +2547,9 @@ msgstr "" "Verzia firmvéru jednotky MMU nekompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 6b75e97a1..fbf222498 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -404,7 +404,7 @@ msgstr "" "normalt läge" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:315 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 #: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 msgid "Cut filament" msgstr "Skär filament" @@ -502,7 +502,7 @@ msgid "ERROR:" msgstr "FEL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:319 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 #: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 msgid "Eject from MMU" msgstr "Utmat från MMU" @@ -1095,7 +1095,7 @@ msgstr "Laddar färg" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:327 ../../Firmware/ultralcd.cpp:2205 +#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 #: ../../Firmware/ultralcd.cpp:3798 msgid "Loading filament" msgstr "Laddar filament" @@ -1133,7 +1133,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARAR INTE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/mmu2_reporting.cpp:330 msgid "MMU Retry: Restoring temperature..." msgstr "MMU försök igen: Återställer temperatur..." @@ -2157,7 +2157,7 @@ msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:323 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 msgid "Testing filament" msgstr "Testar filament" @@ -2475,13 +2475,6 @@ msgstr "okänd" msgid "unknown state" msgstr "okänt stat" -#. MSG_BTN_MORE c=8 -#. @todo convert to PROGMEM_N1 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 #: ../../Firmware/ultralcd.cpp:5941 @@ -2560,6 +2553,9 @@ msgstr "" "MMU-enhetens firmwareversion är inkompatibel med skrivarens FW. Uppdatering " "till version 2.1.9." +#~ msgid "⏬" +#~ msgstr "⏬" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 588985b7f15214b1649c6bf1b256ed4ab1c29b3d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 19:02:27 +0100 Subject: [PATCH 030/240] more missing translations --- 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 | 2 +- lang/po/Firmware_sv.po | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 0dace97f7..993ccf32b 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2505,7 +2505,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU PODPĚTÍ VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index c0322b2f9..0105742f2 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2532,7 +2532,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU-UNTERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1ecf95c0d..fdce8b6d0 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2529,7 +2529,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU BAJO VOLTAJE VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 605bdbba9..89d92a524 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2541,7 +2541,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU SOUS-TENSION VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 8054e85c6..79ba9a2e9 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2522,7 +2522,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU PODNAPON VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index b27d4c136..e1b02b3be 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2527,7 +2527,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU ALFESZÜLTSÉ. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 98d9deef5..55314e9b1 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2528,7 +2528,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "SOTTOTENSION MCU VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 06517c3f6..118a3f8b0 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2531,7 +2531,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU ONDERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index a7545a20b..02b8b5edd 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2504,7 +2504,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU UNDERSPENN. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 2f72f9d26..1b245a400 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2523,7 +2523,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU POD NAPIĘCI. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 6d1a9d5b7..9fa40a254 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2527,7 +2527,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU SUBTENSIUNE VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 37cbe1636..9570adaa6 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2511,7 +2511,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU PODPÄŤOVÉ VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index fbf222498..6959f1359 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2503,7 +2503,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "LADDA TILL EXTR. MISLYCKADES" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2517,7 +2517,7 @@ msgstr "" #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "" +msgstr "MCU UNDERSPÄNN. VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 From 61f89246e8d96f584f48d2ac8ba0a570c7edb627 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 9 Mar 2023 19:43:08 +0100 Subject: [PATCH 031/240] Fix build too long translation --- lang/po/Firmware_sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 6959f1359..9f8d0b14f 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2503,7 +2503,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "LADDA TILL EXTR. MISLYCKADES" +msgstr "" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 From 7676df88a4ae9590e0cfea0c5f46bb106e03512f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 08:44:32 +0100 Subject: [PATCH 032/240] Rename forgotten `MMU2` message to `MMU` --- Firmware/ultralcd.cpp | 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_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f933246ae..754260789 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1673,7 +1673,7 @@ static void lcd_support_menu() } } else - MENU_ITEM_BACK_P(PSTR("MMU2 N/A")); + MENU_ITEM_BACK_P(PSTR("MMU N/A")); // Show the FlashAir IP address, if the card is available. diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 993ccf32b..b5d8da016 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1165,7 +1165,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 pripojeno" +msgstr "MMU pripojeno" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 0105742f2..3ecb9c680 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -1177,7 +1177,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 verbunden" +msgstr "MMU verbunden" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index fdce8b6d0..8bde20c8f 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1177,7 +1177,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 conectado" +msgstr "MMU conectado" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 89d92a524..4e9a2625c 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1183,7 +1183,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 connecte" +msgstr "MMU connecte" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 79ba9a2e9..279050643 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -1175,7 +1175,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 spojen" +msgstr "MMU spojen" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index e1b02b3be..32a9603aa 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -1178,7 +1178,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 csatlakozott" +msgstr "MMU csatlakozott" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 55314e9b1..fafda0dc4 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -1179,7 +1179,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 connessa" +msgstr "MMU connessa" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 118a3f8b0..046ac1dda 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -1180,7 +1180,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 verbonden" +msgstr "MMU verbonden" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 02b8b5edd..af9cff12f 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -1171,7 +1171,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 tilkoblet" +msgstr "MMU tilkoblet" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 9fa40a254..9896434f4 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -1178,7 +1178,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 conectat" +msgstr "MMU conectat" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 9570adaa6..e6e88c4cb 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1173,7 +1173,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 pripojene" +msgstr "MMU pripojene" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 9f8d0b14f..f7a81163d 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -1176,7 +1176,7 @@ msgstr "" #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 msgid "MMU connected" -msgstr "MMU2 ansluten" +msgstr "MMU ansluten" #. MSG_MAGNETS_COMP c=13 #: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 From 22e70faa71e86c75fbf38cef460dd333c0b1826b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 09:29:03 +0100 Subject: [PATCH 033/240] Remove `MMU2` and `MMU unit` messages Saves 26byte of flash Saves -368 byte in trasnlations --- Firmware/mmu2.h | 2 +- Firmware/mmu2/errors_list.h | 10 +++--- Firmware/mmu2_log.cpp | 2 +- Firmware/mmu2_log.h | 6 ++-- Firmware/mmu2_marlin.h | 4 +-- Firmware/mmu2_protocol_logic.cpp | 2 +- Firmware/mmu2_state.h | 2 +- Firmware/ultralcd.cpp | 2 +- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 +- .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 +- .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- MK404-build.sh | 2 +- PF-build.sh | 2 +- lang/po/Firmware.pot | 10 +++--- lang/po/Firmware_cs.po | 22 ++++++------ lang/po/Firmware_de.po | 20 +++++------ lang/po/Firmware_es.po | 20 +++++------ lang/po/Firmware_fr.po | 16 ++++----- lang/po/Firmware_hr.po | 28 +++++++-------- lang/po/Firmware_hu.po | 22 ++++++------ lang/po/Firmware_it.po | 28 +++++++-------- lang/po/Firmware_nl.po | 26 +++++++------- lang/po/Firmware_no.po | 34 +++++++++---------- lang/po/Firmware_pl.po | 20 +++++------ lang/po/Firmware_ro.po | 26 +++++++------- lang/po/Firmware_sk.po | 22 ++++++------ lang/po/Firmware_sv.po | 28 +++++++-------- 30 files changed, 184 insertions(+), 184 deletions(-) diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index f21fe614e..ac349f73e 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -30,7 +30,7 @@ struct Version { }; /// Top-level interface between Logic and Marlin. -/// Intentionally named MMU2 to be (almost) a drop-in replacement for the previous implementation. +/// Intentionally named MMU to be (almost) a drop-in replacement for the previous implementation. /// Most of the public methods share the original naming convention as well. class MMU2 { public: diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 5a7c35630..145a5b534 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -255,17 +255,17 @@ static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); //// //static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 -static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU unit not responding. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU unit not responding correctly. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 static const char MSG_DESC_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("Cannot perform the action, filament is already loaded. Unload it first."); ////MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 static const char MSG_DESC_INVALID_TOOL[] PROGMEM_I1 = ISTR("Requested filament tool is not available on this hardware. Check the G-code for tool index out of range (T0-T4)."); ////MSG_DESC_INVALID_TOOL c=20 r=8 static const char MSG_DESC_QUEUE_FULL[] PROGMEM_I1 = ISTR("MMU Firmware internal error, please reset the MMU."); ////MSG_DESC_QUEUE_FULL c=20 r=8 -static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU unit or updating the firmware. If the issue persists, contact support."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware. If the issue persists, contact support."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detected unexpectedly. Ensure no filament is loaded. Check the sensors and wiring."); ////MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU unit."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 +static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); diff --git a/Firmware/mmu2_log.cpp b/Firmware/mmu2_log.cpp index 69531844b..17bd2a95b 100644 --- a/Firmware/mmu2_log.cpp +++ b/Firmware/mmu2_log.cpp @@ -3,7 +3,7 @@ namespace MMU2 { void LogErrorEvent_P(const char *msg){ - SERIAL_ECHO_START; //!@todo Decide MMU2 errors on serial line + SERIAL_ECHO_START; //!@todo Decide MMU errors on serial line SERIAL_MMU2(); SERIAL_ECHOLNRPGM(msg); } diff --git a/Firmware/mmu2_log.h b/Firmware/mmu2_log.h index 10d9d897f..bc4313294 100644 --- a/Firmware/mmu2_log.h +++ b/Firmware/mmu2_log.h @@ -33,21 +33,21 @@ void LogEchoEvent_P(const char *msg); SERIAL_MMU2(); \ SERIAL_ECHOLN(S); \ } while (0) - #define MMU2_ERROR_MSGLN(S) MMU2_ECHO_MSGLN(S) //!@todo Decide MMU2 errors on serial line + #define MMU2_ERROR_MSGLN(S) MMU2_ECHO_MSGLN(S) //!@todo Decide MMU errors on serial line #define MMU2_ECHO_MSGRPGM(S) \ do { \ SERIAL_ECHO_START; \ SERIAL_MMU2(); \ SERIAL_ECHORPGM(S); \ } while (0) - #define MMU2_ERROR_MSGRPGM(S) MMU2_ECHO_MSGRPGM(S) //!@todo Decide MMU2 errors on serial line + #define MMU2_ERROR_MSGRPGM(S) MMU2_ECHO_MSGRPGM(S) //!@todo Decide MMU errors on serial line #define MMU2_ECHO_MSG(S) \ do { \ SERIAL_ECHO_START; \ SERIAL_MMU2(); \ SERIAL_ECHO(S); \ } while (0) - #define MMU2_ERROR_MSG(S) MMU2_ECHO_MSG(S) //!@todo Decide MMU2 errors on serial line + #define MMU2_ERROR_MSG(S) MMU2_ECHO_MSG(S) //!@todo Decide MMU errors on serial line #else // #ifndef UNITTEST diff --git a/Firmware/mmu2_marlin.h b/Firmware/mmu2_marlin.h index 9d35c4c0c..199de649e 100644 --- a/Firmware/mmu2_marlin.h +++ b/Firmware/mmu2_marlin.h @@ -1,8 +1,8 @@ /// @file -/// The sole purpose of this interface is to separate Marlin1/Marlin2 from the MMU2 top logic layer. +/// The sole purpose of this interface is to separate Marlin1/Marlin2 from the MMU top logic layer. /// Why? /// - unify implementation among MK3 and Buddy FW -/// - enable unit testing of MMU2 top layer +/// - enable unit testing of MMU top layer #pragma once #include diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 58f34a31d..f64c9a99b 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -20,7 +20,7 @@ namespace MMU2 { /// Changing the supportedMmuVersion numbers requires patching MSG_DESC_FW_UPDATE_NEEDED and all its related translations by hand. /// /// The message reads: -/// "The MMU unit firmware version incompatible with the printer's FW. Update to version 2.1.6." +/// "The MMU firmware version incompatible with the printer's FW. Update to version 2.1.6." /// /// Currently, this is not possible to perform automatically at compile time with the existing languages/translations infrastructure. /// To save space a "dumb" solution was chosen + a few static_assert checks in errors_list.h preventing the code from compiling when the string doesn't match. diff --git a/Firmware/mmu2_state.h b/Firmware/mmu2_state.h index 85e6be686..0961c8883 100644 --- a/Firmware/mmu2_state.h +++ b/Firmware/mmu2_state.h @@ -10,7 +10,7 @@ namespace MMU2 { /// - Connecting /// - Stopped /// -/// When the printer's FW starts, the MMU2 mode is either Stopped or NotResponding (based on user's preference). +/// When the printer's FW starts, the MMU mode is either Stopped or NotResponding (based on user's preference). /// When the MMU successfully establishes communication, the state changes to Active. enum class xState : uint_fast8_t { Active, ///< MMU has been detected, connected, communicates and is ready to be worked with. diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 754260789..00f6878c1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1555,7 +1555,7 @@ void TestPullupCrash() { //! If MMU is not connected //! //! @code{.unparsed} -//! | MMU2 N/A | c=18 +//! | MMU N/A | c=18 //! @endcode //! //! If Flash Air is connected diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 19a3de4cd..9fcc29d25 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -508,7 +508,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 021adf142..2f1f1108e 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -509,7 +509,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index b500b6a0b..d64af4ab7 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -508,7 +508,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER // This is experimental feature requested by our test department. diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index e0e03716b..8357d20c4 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -509,7 +509,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER // This is experimental feature requested by our test department. diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 2bfd09085..1182a70e6 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -677,7 +677,7 @@ #define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 676056ec0..e2d4457e8 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -681,7 +681,7 @@ #define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET -#define MMU_DEBUG //print communication between MMU2 and printer on serial +#define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER // This is experimental feature requested by our test department. diff --git a/MK404-build.sh b/MK404-build.sh index da44b5bcd..b574d12ef 100755 --- a/MK404-build.sh +++ b/MK404-build.sh @@ -240,7 +240,7 @@ fi if [[ "$MK404_PRINTER" == "MK25" || "$MK404_PRINTER" == "MK25S" ]]; then MK404_PRINTER="${MK404_PRINTER}_mR13" else - if [ "$mk404_flag" == "2" ]; then # Check if MMU2 is selected only for MK3/S + if [ "$mk404_flag" == "2" ]; then # Check if MMU is selected only for MK3/S MK404_PRINTER="${MK404_PRINTER}MMU2" fi fi diff --git a/PF-build.sh b/PF-build.sh index a45409265..eb205cc98 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -1511,7 +1511,7 @@ if [[ "$output_flag" == "1" || -z "$output_flag" ]]; then fi # For MMU2S - if [[ "$mk404_flag" == "2" || "$mk404_flag" == "MMU2" || "$mk404_flag" == "MMU2S" ]]; then # Check if MMU2 is selected only for MK3/S + if [[ "$mk404_flag" == "2" || "$mk404_flag" == "MMU2" || "$mk404_flag" == "MMU2S" ]]; then # Check if MMU is selected only for MK3/S mk404_flag=2 fi diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 079aea90e..c46172f5c 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -953,7 +953,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" @@ -1144,14 +1144,14 @@ msgstr "" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" @@ -1733,7 +1733,7 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." +msgid "Remove the ejected filament from the front of the MMU." msgstr "" #. MSG_RENAME c=18 @@ -2124,7 +2124,7 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index b5d8da016..4898f56f4 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -981,7 +981,7 @@ msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW. Pokud pretrvava, " @@ -1147,7 +1147,7 @@ msgstr "MMU selhani zav" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "MMU neodpovida spravne. Zkontrolujte zapojeni kabelu. Pokud obtize " @@ -1156,7 +1156,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "MMU neodpovida. Zkontrolujte kabely a jejich zapojeni. Pokud potize " @@ -2515,8 +2515,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Odstraňte vysunuté filament z přední části jednotky MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Odstraňte vysunuté filament z přední části MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2535,10 +2535,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verze firmwaru jednotky MMU není kompatibilní s FW tiskárny. Aktualizujte na" +"Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na" " verzi 2.1.9." #~ msgid "⏬" @@ -2554,7 +2554,7 @@ msgstr "" #~ msgstr "Vyberte extruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v MMU " @@ -2588,8 +2588,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 a novejsi" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Opravte chybu a pote stisknete tlacitko na MMU." #~ msgid "Load all" #~ msgstr "Zavest vse" @@ -2625,7 +2625,7 @@ msgstr "" #~ msgstr "Prosim vyjmete filament a pote stisknete tlacitko." #~ msgid "Please update firmware in your MMU2. Waiting for reset." -#~ msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." +#~ msgstr "Prosim aktualizujte firmware ve vasi MMU2. Cekam na reset." #~ msgid "Press the knob to resume nozzle temperature." #~ msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 3ecb9c680..1c8145c06 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -992,10 +992,10 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Interner Laufzeitfehler. MMU-Einheit zurücksetzen oder Firmware " +"Interner Laufzeitfehler. MMU zurücksetzen oder Firmware " "aktualisieren. Ansonsten Support kontaktieren." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1158,7 +1158,7 @@ msgstr "MMU Ladefehler" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die " @@ -1168,7 +1168,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn" @@ -2542,9 +2542,9 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." +msgid "Remove the ejected filament from the front of the MMU." msgstr "" -"Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU-Einheit." +"Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2563,10 +2563,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Die Firmware-Version der MMU-Einheit ist mit der FW des Druckers nicht " +"Die Firmware-Version der MMU ist mit der FW des Druckers nicht " "kompatibel. Update auf Version 2.1.9." #~ msgid "⏬" @@ -2582,7 +2582,7 @@ msgstr "" #~ msgstr "Wähle extruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU meldet Inkompatibilität FW. Stell sicher, dass MMU-FW aktuell ist." @@ -2615,7 +2615,7 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS v0.4 oder neuer" -#~ msgid "Fix the issue and then press button on MMU unit." +#~ msgid "Fix the issue and then press button on MMU." #~ msgstr "Beseitigen Sie das Problem und drücken Sie dann den Knopf am MMU." #~ msgid "Load all" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 8bde20c8f..ffe86b9ea 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -992,7 +992,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Error interno de ejecucion. Intenta reiniciar la MMU o actualizar el " @@ -1159,7 +1159,7 @@ msgstr "Carga MMU falla" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "La MMU no responde correcta-mente. Comprueba el cableado y los conectores. " @@ -1168,7 +1168,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "La MMU no responde. Comprueba el cableado y los conectores. Si el problema " @@ -2539,8 +2539,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Retire el filamento expulsado de la parte frontal de la unidad MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Retire el filamento expulsado de la parte frontal de la MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2560,10 +2560,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La versión de firmware de la unidad MMU es incompatible con el FW de la " +"La versión de firmware de la MMU es incompatible con el FW de la " "impresora. Actualizar a la versión 2.1.9." #~ msgid "⏬" @@ -2576,7 +2576,7 @@ msgstr "" #~ msgstr "Elegir extrusor:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "La MMU informa que su FW no es compatible con el de la impresora. Asegurate " @@ -2610,8 +2610,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 o mas nueva" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Corrige el problema y pulsa el boton en la unidad MMU." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Corrige el problema y pulsa el boton en la MMU." #~ msgid "Load all" #~ msgstr "Intr. todos fil." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 4e9a2625c..e3cf1c278 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -999,7 +999,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour" @@ -1165,7 +1165,7 @@ msgstr "Def. charg. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "MMU ne repond pas correctement. Verifiez le cablage et les connecteurs. Si " @@ -1174,7 +1174,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "MMU ne repond pas. Verifiez le cablage et les connecteurs. Si le probleme " @@ -2551,8 +2551,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Retirez le filament éjecté de l'avant de l'unité MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Retirez le filament éjecté de l'avant de la MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2571,7 +2571,7 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " @@ -2587,7 +2587,7 @@ msgstr "" #~ msgstr "Choisir extrudeur:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU signale que sa version de FW est incompatible avec le FW de " @@ -2621,7 +2621,7 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS v0.4 ou +recent" -#~ msgid "Fix the issue and then press button on MMU unit." +#~ msgid "Fix the issue and then press button on MMU." #~ msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." #~ msgid "Load all" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 279050643..a0f383724 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -991,10 +991,10 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU jedinicu ili " +"Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU ili " "azurirati firmware. Ako se problem nastavi, obratite se podrsci." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1157,19 +1157,19 @@ msgstr "Neusp. MMU punj" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU jedinica ne reagira ispravno. Provjerite ozicenje i konektore. Ako se " +"MMU ne reagira ispravno. Provjerite ozicenje i konektore. Ako se " "problem nastavi, obratite se podrsci." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU jedinica ne reagira. Provjerite ozicenje i konektore. Ako se problem " +"MMU ne reagira. Provjerite ozicenje i konektore. Ako se problem " "nastavi, obratite se podrsci." #. MSG_MMU_CONNECTED c=18 @@ -2532,8 +2532,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Uklonite izbačenu nit s prednje strane MMU jedinice." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Uklonite izbačenu nit s prednje strane MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2552,10 +2552,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzija firmware-a MMU jedinice nekompatibilna s FW-om pisača. Ažuriranje na" +"Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na" " verziju 2.1.9." #~ msgid "⏬" @@ -2568,10 +2568,10 @@ msgstr "" #~ msgstr "Odaberite ekstruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU jedinica prijavljuje svoju FW verziju nekompatibilnu s firmwerom " +#~ "MMU prijavljuje svoju FW verziju nekompatibilnu s firmwerom " #~ "printera. Provjerite je li MMU firmware azuriran." #~ msgid "" @@ -2602,8 +2602,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS v0.4 ili noviji" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Rijesite problem, a zatim pritisnite gumb na MMU jedinici." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Rijesite problem, a zatim pritisnite gumb na MMU." #~ msgid "Load all" #~ msgstr "Napuni sve" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 32a9603aa..38e80e491 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -994,7 +994,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret. Ha a " @@ -1160,7 +1160,7 @@ msgstr "MMU bet. hibak" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "Az MMU helytelenul valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a " @@ -1169,7 +1169,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a problema" @@ -2537,8 +2537,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Távolítsa el a kilökött izzószálat az MMU egység elejéről." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Távolítsa el a kilökött izzószálat az MMU elejéről." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2557,10 +2557,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Az MMU egység firmware-verziója nem kompatibilis a nyomtató FW-vel. " +"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. " "Frissítés a 2.1.9-es verzióra." #~ msgid "⏬" @@ -2573,7 +2573,7 @@ msgstr "" #~ msgstr "Extruder valasztas:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Az MMU FW verzioja nem kompatibilis a nyomtatoeval. Kerlek frissitsd az MMU " @@ -2605,7 +2605,7 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS v0.4 vagy ujabb" -#~ msgid "Fix the issue and then press button on MMU unit." +#~ msgid "Fix the issue and then press button on MMU." #~ msgstr "Hozd helyre a hibat, majd nyomd meg a gombot az MMU egysegen." #~ msgid "Load all" @@ -2644,8 +2644,8 @@ msgstr "" #~ msgid "Please remove filament and then press the knob." #~ msgstr "Kerlek, tavolitsd el a filamentet, majd nyomd meg a gombot." -#~ msgid "Please update firmware in your MMU2. Waiting for reset." -#~ msgstr "Kerlek, frissitsd az MMU2 firmverjet. Varom az ujrainditast." +#~ msgid "Please update firmware in your MMU. Waiting for reset." +#~ msgstr "Kerlek, frissitsd az MMU firmverjet. Varom az ujrainditast." #~ msgid "Press the knob to resume nozzle temperature." #~ msgstr "Nyomd meg a gombot a fuvoka ismetelt felfutesehez." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index fafda0dc4..ecee0f021 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -995,10 +995,10 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Errore runtime interno. Provare a resettare l'unità MMU o ad aggiornare il " +"Errore runtime interno. Provare a resettare la MMU o ad aggiornare il " "FW. Se il problema persiste, contattare l'assistenza." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1161,19 +1161,19 @@ msgstr "Car MMU falliti" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"Unità MMU non risponde correttamente. Controlla cavi e connettori. Se il " +"MMU non risponde correttamente. Controlla cavi e connettori. Se il " "problema persiste contatta il supporto." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"Unità MMU non risponde. Controlla cavi e connettori. Se il problema persiste" +"MMU non risponde. Controlla cavi e connettori. Se il problema persiste" " contatta il supporto." #. MSG_MMU_CONNECTED c=18 @@ -2538,8 +2538,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Rimuovere il filamento espulso dalla parte anteriore dell'unità MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Rimuovere il filamento espulso dalla parte anteriore dell MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2558,10 +2558,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La versione del firmware dell'unità MMU non è compatibile con il firmware " +"La versione del firmware dell MMU non è compatibile con il firmware " "della stampante. Aggiornamento alla versione 2.1.9." #~ msgid "⏬" @@ -2574,10 +2574,10 @@ msgstr "" #~ msgstr "Seleziona estrusore:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "L'unità MMU segnala la sua versione FW incompatibile con il FW della " +#~ "La MMU segnala la sua versione FW incompatibile con il FW della " #~ "stampante. Verifica che il FW della MMU sia aggiornato." #~ msgid "" @@ -2607,8 +2607,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 o superiore" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Risolvere il problema e premere il bottone sull'unita MMU." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Risolvere il problema e premere il bottone sull MMU." #~ msgid "Load all" #~ msgstr "Caricare tutti" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 046ac1dda..6018f7cfc 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -996,10 +996,10 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Interne runtime fout. Probeer de MMU-eenheid te resetten of de firmware bij " +"Interne runtime fout. Probeer de MMU te resetten of de firmware bij " "te werken. Als het probleem aanhoudt, neem dan contact op met support." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1162,19 +1162,19 @@ msgstr "MMU laadfout" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU eenheid reageert niet correct. Controleer de bedrading en connectoren. " +"MMU reageert niet correct. Controleer de bedrading en connectoren. " "Als het probleem aanhoudt, neem dan contact op met support." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU eenheid reageert niet. Controleer de bedrading en connectoren. Als het " +"MMU reageert niet. Controleer de bedrading en connectoren. Als het " "probleem aanhoudt, neem dan contact op met support." #. MSG_MMU_CONNECTED c=18 @@ -2541,9 +2541,9 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." +msgid "Remove the ejected filament from the front of the MMU." msgstr "" -"Verwijder het uitgeworpen filament uit de voorkant van de MMU-eenheid." +"Verwijder het uitgeworpen filament uit de voorkant van de MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2562,10 +2562,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"De firmwareversie van de MMU-eenheid is niet compatibel met de firmware van " +"De firmwareversie van de MMU is niet compatibel met de firmware van " "de printer. Update naar versie 2.1.9." #~ msgid "⏬" @@ -2578,7 +2578,7 @@ msgstr "" #~ msgstr "Kies extruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "De MMU meldt dat zijn FW-versie niet compatibel is met de firmware van de " @@ -2612,8 +2612,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 of nieuwer" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Los het probleem op en druk vervolgens op de knop op de MMU-eenheid." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Los het probleem op en druk vervolgens op de knop op de MMU." #~ msgid "Load all" #~ msgstr "Laad alle" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index af9cff12f..3f3a23be2 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -987,10 +987,10 @@ msgstr "Sett inn filamentet i ekstruderen og deretter trykk inn valghjulet." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Intern runtime feil. Prøv omstart av MMU enheten eller oppdater fastvaren. " +"Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren. " "Hvis feilen vedvarer, kontakt kundestøtte." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1153,19 +1153,19 @@ msgstr "MMU lastefeil" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU enhet svarer ikke riktig. Sjekk ledninger og koblinger. Hvis problemet " +"MMU svarer ikke riktig. Sjekk ledninger og koblinger. Hvis problemet " "vedvarer, kontakt støtte" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU enhet svarer ikke. Sjekk ledninger og koblinger. Hvis problemet " +"MMU svarer ikke. Sjekk ledninger og koblinger. Hvis problemet " "vedvarer, kontakt støtte" #. MSG_MMU_CONNECTED c=18 @@ -1546,7 +1546,7 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Sett inn filament i det første røret bak MMU-enheten og trykk valghjulet for" +"Sett inn filament i det første røret bak MMU og trykk valghjulet for" " å laste." #. MSG_PLEASE_LOAD_PLA c=20 r=4 @@ -2514,8 +2514,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Fjern det utkastede filamentet fra fronten av MMU-enheten." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Fjern det utkastede filamentet fra fronten av MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2534,10 +2534,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU-enhetens fastvareversjon er inkompatibel med skriverens FW. Oppdatering " +"MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering " "til versjon 2.1.9." #~ msgid "⏬" @@ -2550,10 +2550,10 @@ msgstr "" #~ msgstr "Velg ekstruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU enheten raporterer at fastvareversjonen ikke er kompatibel med " +#~ "MMU raporterer at fastvareversjonen ikke er kompatibel med " #~ "printerens fastvare. Vær sikker på at MMU fastvaren er oppdatert." #~ msgid "" @@ -2583,8 +2583,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 eller nyere" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Løs problemet og trykk på MM-enhetens knapp." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Løs problemet og trykk på MMU knapp." #~ msgid "Load all" #~ msgstr "Last alle" @@ -2619,8 +2619,8 @@ msgstr "" #~ msgid "Please remove filament and then press the knob." #~ msgstr "Fjern filamentet og trykk valghjulet." -#~ msgid "Please update firmware in your MMU2. Waiting for reset." -#~ msgstr "Oppdater din MMU2 systemvare. Venter på omstart..." +#~ msgid "Please update firmware in your MMU. Waiting for reset." +#~ msgstr "Oppdater din MMU systemvare. Venter på omstart..." #~ msgid "Press the knob to resume nozzle temperature." #~ msgstr "Trykk valghjulet for å fortsette oppvarming." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 1b245a400..54799d9b8 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -993,7 +993,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW. Skontaktuj sie z " @@ -1159,7 +1159,7 @@ msgstr "Bledy lad. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "MMU nie dziala. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje," @@ -1168,7 +1168,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal " @@ -1552,7 +1552,7 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go " +"Wsun filament do pierwszego kanalu w MMU i nacisnij pokretlo, aby go " "zaladowac." #. MSG_PLEASE_LOAD_PLA c=20 r=4 @@ -2533,8 +2533,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Usuń wyrzucony filament z przodu jednostki MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Usuń wyrzucony filament z przodu MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2553,10 +2553,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Wersja oprogramowania układowego modułu MMU jest niezgodna z oprogramowaniem" +"Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem" " sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." #~ msgid "⏬" @@ -2569,7 +2569,7 @@ msgstr "" #~ msgstr "Wybierz ekstruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW MMU jest " @@ -2602,7 +2602,7 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 lub nowszy" -#~ msgid "Fix the issue and then press button on MMU unit." +#~ msgid "Fix the issue and then press button on MMU." #~ msgstr "Rozwiaz problem i wcisnij przycisk na MMU." #~ msgid "Load all" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 9896434f4..fcb3da664 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -994,10 +994,10 @@ msgstr "Infige filamentul (nu-l incarca) in extruder si apasa butonul." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"ERR de rulare interna. Incercati sa resetati unitatea MMU sau actualizati " +"ERR de rulare interna. Incercati sa resetati MMU sau actualizati " "firmwarul. Daca problema persista, contactati dep. support" #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1160,19 +1160,19 @@ msgstr "Err. incarc MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"Unitatea MMU nu raspunde corect. Verificati cablajul si conectorii. Daca " +"MMU nu raspunde corect. Verificati cablajul si conectorii. Daca " "problema persista, contactati dep. support" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"Unitatea MMU nu raspunde. Verificati cablajul si conectorii. Daca problema " +"MMU nu raspunde. Verificati cablajul si conectorii. Daca problema " "persista, contactati dep. support" #. MSG_MMU_CONNECTED c=18 @@ -2537,8 +2537,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Scoateți filamentul ejectat din partea din față a unității MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Scoateți filamentul ejectat din partea din față a MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2558,10 +2558,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Versiunea de firmware a unității MMU este incompatibilă cu FW-ul " +"Versiunea de firmware a MMU este incompatibilă cu FW-ul " "imprimantei. Actualizați la versiunea 2.1.9." #~ msgid "⏬" @@ -2574,7 +2574,7 @@ msgstr "" #~ msgstr "Alege extruderul:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Versiune FW MMU este incompatibil cu cea a imprimantei. Asigurati-va ca FW " @@ -2607,8 +2607,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 / mai nou" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Rezolvati problema si apasati butonul pe unitatea MMU." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Rezolvati problema si apasati butonul pe MMU." #~ msgid "Load all" #~ msgstr "Incarcati toate" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index e6e88c4cb..7fc3dd28c 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -989,7 +989,7 @@ msgstr "Vlozte filament (nezavadzajte) do extruderu a stlacte tlacidlo" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware. Ak chyba " @@ -1155,7 +1155,7 @@ msgstr "MMU zlyhalo" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" "MMU neodpoveda spravne. Skontrolujte zapojenie a konektory. Ak chyba " @@ -1164,7 +1164,7 @@ msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" "MMU neodpoveda. Skontrolujte zapojenie a konektory. Ak chyba pretrvava, " @@ -2521,8 +2521,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Odstráňte vysunuté filament z prednej časti jednotky MMU." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Odstráňte vysunuté filament z prednej časti MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2541,10 +2541,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzia firmvéru jednotky MMU nekompatibilná s FW tlačiarne. Aktualizácia na " +"Verzia firmvéru MMU nekompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." #~ msgid "⏬" @@ -2557,7 +2557,7 @@ msgstr "" #~ msgstr "Zvolte extruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Verzia FW MMU je nekompatibilna s FW tlaciarne. Skontrolujte aktualizacie " @@ -2590,8 +2590,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS 0.4 a novsie" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Opravte chybu a potom stlacte tlacidlo na jednotke MMU." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Opravte chybu a potom stlacte tlacidlo na MMU." #~ msgid "Load all" #~ msgstr "Zaviest vsetko" @@ -2627,7 +2627,7 @@ msgstr "" #~ msgstr "Prosim vyberte filament a potom stlacte tlacidlo." #~ msgid "Please update firmware in your MMU2. Waiting for reset." -#~ msgstr "Prosim aktualizujte firmware v vasej MMU2 jednotke. Cakam na reset." +#~ msgstr "Prosim aktualizujte firmware v vasej MMU2. Cakam na reset." #~ msgid "Press the knob to resume nozzle temperature." #~ msgstr "Pre pokracovanie nahrievania trysky stlacte tlacidlo." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index f7a81163d..482136a21 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -992,10 +992,10 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU unit or updating the firmware." +"Internal runtime error. Try resetting the MMU or updating the firmware." " If the issue persists, contact support." msgstr "" -"Internt körtidsfel. Prova återställa MMU-enheten eller uppdatera firmware. " +"Internt körtidsfel. Prova återställa MMU eller uppdatera firmware. " "Kontakta supporten om problemet kvarstår." #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1158,19 +1158,19 @@ msgstr "MMU-laddn felar" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "" -"MMU unit not responding correctly. Check the wiring and connectors. If the " +"MMU not responding correctly. Check the wiring and connectors. If the " "issue persists, contact support." msgstr "" -"MMU-enheten svarar inte korrekt. Kontrollera kablarna och kontakterna.Om " +"MMU svarar inte korrekt. Kontrollera kablarna och kontakterna.Om " "problemet kvarstår, kontakta supporten." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "" -"MMU unit not responding. Check the wiring and connectors. If the issue " +"MMU not responding. Check the wiring and connectors. If the issue " "persists, contact support." msgstr "" -"MMU-enheten svarar inte. Kontrollera kablarna och kontakterna.Om problemet " +"MMU svarar inte. Kontrollera kablarna och kontakterna.Om problemet " "kvarstår, kontakta supporten." #. MSG_MMU_CONNECTED c=18 @@ -2527,8 +2527,8 @@ msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 -msgid "Remove the ejected filament from the front of the MMU unit." -msgstr "Ta bort den utskjutna filament från framsidan av MMU-enheten." +msgid "Remove the ejected filament from the front of the MMU." +msgstr "Ta bort den utskjutna filament från framsidan av MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2547,10 +2547,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" -"The MMU unit firmware version incompatible with the printer's FW. Update to " +"The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU-enhetens firmwareversion är inkompatibel med skrivarens FW. Uppdatering " +"MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering " "till version 2.1.9." #~ msgid "⏬" @@ -2563,10 +2563,10 @@ msgstr "" #~ msgstr "Välj extruder:" #~ msgid "" -#~ "The MMU unit reports its FW version incompatible with the printer's " +#~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU-enheten rapporterar att FW-versionen är inkompatibelmed din skrivare. " +#~ "MMU rapporterar att FW-versionen är inkompatibelmed din skrivare. " #~ "Säkerställ att MMU-firmwaren är aktuell." #~ msgid "" @@ -2595,8 +2595,8 @@ msgstr "" #~ msgid "FS v0.4 or newer" #~ msgstr "FS v0.4 el nyare" -#~ msgid "Fix the issue and then press button on MMU unit." -#~ msgstr "Åtgärda problemet och tryck sedan på knappen på MMU-enheten." +#~ msgid "Fix the issue and then press button on MMU." +#~ msgstr "Åtgärda problemet och tryck sedan på knappen på MMU." #~ msgid "Load all" #~ msgstr "Ladda alla" From 5582fbf71e8f9f0250a3835fa2690231dc96f2ef Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 09:47:09 +0100 Subject: [PATCH 034/240] Translate missing messages part x --- lang/po/Firmware_cs.po | 4 ++-- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 4 ++-- lang/po/Firmware_fr.po | 4 ++-- lang/po/Firmware_hr.po | 4 ++-- lang/po/Firmware_hu.po | 4 ++-- lang/po/Firmware_it.po | 4 ++-- lang/po/Firmware_nl.po | 4 ++-- lang/po/Firmware_no.po | 4 ++-- lang/po/Firmware_pl.po | 4 ++-- lang/po/Firmware_ro.po | 4 ++-- lang/po/Firmware_sk.po | 4 ++-- lang/po/Firmware_sv.po | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 4898f56f4..023ed2e20 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2491,7 +2491,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "NAČÍST DO EXTR. SEL." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2521,7 +2521,7 @@ msgstr "Odstraňte vysunuté filament z přední části MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 1c8145c06..e0c2b7dd8 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2518,7 +2518,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "FEHL LADEN ZUM EXTR:" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2549,7 +2549,7 @@ msgstr "" #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index ffe86b9ea..124e78e85 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2515,7 +2515,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "FALL. CARGAR A EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2545,7 +2545,7 @@ msgstr "Retire el filamento expulsado de la parte frontal de la MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index e3cf1c278..4e7aa0c06 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2527,7 +2527,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "ÉCHOUÉ CHARGE A EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2557,7 +2557,7 @@ msgstr "Retirez le filament éjecté de l'avant de la MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index a0f383724..511b2489d 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2508,7 +2508,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "NEUSPJEH PUNI EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2538,7 +2538,7 @@ msgstr "Uklonite izbačenu nit s prednje strane MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 38e80e491..791bc9224 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2513,7 +2513,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "SIKERÜLT BETÖLT EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2543,7 +2543,7 @@ msgstr "Távolítsa el a kilökött izzószálat az MMU elejéről." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index ecee0f021..9e33ef121 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2514,7 +2514,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "FALL CARICA SU EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2544,7 +2544,7 @@ msgstr "Rimuovere il filamento espulso dalla parte anteriore dell MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 6018f7cfc..db529b832 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2517,7 +2517,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "FOUT LADEN NA. EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2548,7 +2548,7 @@ msgstr "" #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 3f3a23be2..c32fbf679 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2490,7 +2490,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "MISLUKT LAST EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2520,7 +2520,7 @@ msgstr "Fjern det utkastede filamentet fra fronten av MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 54799d9b8..2995e1f61 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2509,7 +2509,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "PRZEGRZ. ŁADOW EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2539,7 +2539,7 @@ msgstr "Usuń wyrzucony filament z przodu MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index fcb3da664..a09e248ab 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2513,7 +2513,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "A REUSIT ÎNCAR EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2543,7 +2543,7 @@ msgstr "Scoateți filamentul ejectat din partea din față a MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 7fc3dd28c..4daae866b 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2497,7 +2497,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "ZLYHALO NAČÍTAŤ EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2527,7 +2527,7 @@ msgstr "Odstráňte vysunuté filament z prednej časti MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 482136a21..8fc259587 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2503,7 +2503,7 @@ msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "" +msgstr "MISLUKT LADDA EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2533,7 +2533,7 @@ msgstr "Ta bort den utskjutna filament från framsidan av MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 msgid "RstMMU" -msgstr "" +msgstr "RstMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 From 79a2bbf86bc39377faf2d601641b362913b163e3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 09:57:07 +0100 Subject: [PATCH 035/240] Translate missing messages part y --- lang/po/Firmware_cs.po | 6 +++--- 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 | 2 +- lang/po/Firmware_sv.po | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 023ed2e20..a79808ede 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2511,7 +2511,7 @@ msgstr "MCU PODPĚTÍ VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Výměn materiálů" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 @@ -2603,8 +2603,8 @@ msgstr "" #~ msgid "MK3 firmware detected on MK3S printer" #~ msgstr "MK3 firmware detekovan na MK3S tiskarne" -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S firmware detekovan na tiskarne MK3" +#msgid "MK3S firmware detected on MK3 printer" +#msgstr "MK3S firmware detekovan na tiskarne MK3" #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pokracuji v tisku..." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index e0c2b7dd8..35f6ae3d1 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2538,7 +2538,7 @@ msgstr "MCU-UNTERSPANN. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Materialwechsel" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 124e78e85..eddeac8d6 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2535,7 +2535,7 @@ msgstr "MCU BAJO VOLTAJE VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Cambios materiales" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 4e7aa0c06..3341ad241 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2547,7 +2547,7 @@ msgstr "MCU SOUS-TENSION VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Changes matériels" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 511b2489d..c99de94b5 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2528,7 +2528,7 @@ msgstr "MCU PODNAPON VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Materijal razmjene" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 791bc9224..dda5951e7 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2533,7 +2533,7 @@ msgstr "MCU ALFESZÜLTSÉ. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Anyagcserék" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 9e33ef121..989e823ff 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2534,7 +2534,7 @@ msgstr "SOTTOTENSION MCU VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Scambi materiali" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index db529b832..60829aa60 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2537,7 +2537,7 @@ msgstr "MCU ONDERSPANN. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Materailwisseling." #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index c32fbf679..603057977 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2510,7 +2510,7 @@ msgstr "MCU UNDERSPENN. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Materialutveksling" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 2995e1f61..e25777ec3 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2529,7 +2529,7 @@ msgstr "MCU POD NAPIĘCI. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Wymiany materiałów" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index a09e248ab..87ffcd15c 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2533,7 +2533,7 @@ msgstr "MCU SUBTENSIUNE VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Schimburi material" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 4daae866b..227b68e73 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2517,7 +2517,7 @@ msgstr "MCU PODPÄŤOVÉ VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Výmen materiálov" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 8fc259587..ead40f88c 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2523,7 +2523,7 @@ msgstr "MCU UNDERSPÄNN. VCC" #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "" +msgstr "Materialutbyten" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 From 0cd807faf1a07dde6f1fcad5aabeb37f348966ce Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 10:05:41 +0100 Subject: [PATCH 036/240] Fix Firmware_cs.po --- lang/po/Firmware_cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index a79808ede..f159238f9 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2603,8 +2603,8 @@ msgstr "" #~ msgid "MK3 firmware detected on MK3S printer" #~ msgstr "MK3 firmware detekovan na MK3S tiskarne" -#msgid "MK3S firmware detected on MK3 printer" -#msgstr "MK3S firmware detekovan na tiskarne MK3" +#~msgid "MK3S firmware detected on MK3 printer" +#~msgstr "MK3S firmware detekovan na tiskarne MK3" #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pokracuji v tisku..." From 616cf61583aca021988322bef534a28ea66b5fe5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 13:54:27 +0100 Subject: [PATCH 037/240] Revert --- Firmware/mmu2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index ac349f73e..f21fe614e 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -30,7 +30,7 @@ struct Version { }; /// Top-level interface between Logic and Marlin. -/// Intentionally named MMU to be (almost) a drop-in replacement for the previous implementation. +/// Intentionally named MMU2 to be (almost) a drop-in replacement for the previous implementation. /// Most of the public methods share the original naming convention as well. class MMU2 { public: From b2cf8fb8745cc994227ea8d9221b0843e4ae5739 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 18:36:21 +0100 Subject: [PATCH 038/240] Fix Swedish Thanks @Painkiller56 for review --- lang/po/Firmware_sv.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index ead40f88c..0f160189c 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -589,7 +589,7 @@ msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" -"FINDA triggades inte vid inladdning av filamment.Se till att filament kan " +"FINDA triggades inte vid inladdning av filamment. Se till att filament kan " "röra sig och att FINDA fungerar." #. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 @@ -736,7 +736,7 @@ msgid "" "filament reached the fsensor and the sensor works." msgstr "" "Filamentsensorn triggades inte av när filamentet ladddades in.Se till att " -"filamentet kan röra sig och att sensornfungerar." +"filamentet kan röra sig och att sensorn fungerar." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 @@ -787,7 +787,9 @@ msgstr "Flöde" msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" -msgstr "För byte av munstycke, läsprusa.io/nozzle-mk3s" +msgstr "" +"För byte av munstycke, läs\n" +" prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 From a5146bc2e3731075ae77de427ef6e94efcb89dc9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 10 Mar 2023 18:39:21 +0100 Subject: [PATCH 039/240] Fix 2 Swedish --- lang/po/Firmware_sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 0f160189c..ac89301ce 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -788,7 +788,7 @@ msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" -"För byte av munstycke, läs\n" +"För byte av munstycke, se\n" " prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 From 4c5948d048623d525de39c7e5f351a7ea7a7dbec Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 12 Mar 2023 17:54:26 +0100 Subject: [PATCH 040/240] Update Solvak translation Thanks to @ingbrzy --- lang/po/Firmware_sk.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 227b68e73..cd7d9e7f0 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1082,7 +1082,7 @@ msgstr "Zaved. do trysky" #. MSG_LOADING_TEST c=18 #: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 msgid "Loading Test" -msgstr "Načítavací test" +msgstr "Záťažový test" #. MSG_LOADING_COLOR c=20 #: ../../Firmware/ultralcd.cpp:2194 @@ -2483,7 +2483,7 @@ msgstr "MMU vyp. prudu" #. MSG_TITLE_FILAMENT_EJECTED c=20 #: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 msgid "FILAMENT EJECTED" -msgstr "FILAMENT EJECTED" +msgstr "FILAMENT VYSUNUTY" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 @@ -2491,13 +2491,13 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Neočakávane bolo zistené filament. Uistite sa, že nie je vložené žiadne " +"Neočakávane zistený filament. Uistite sa, že nie je vložený žiadny " "filament. Skontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "ZLYHALO NAČÍTAŤ EXTR" +msgstr "ZLYHALO ZAVED. EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2505,24 +2505,24 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Načítanie do extrudéra zlyhalo. Skontrolujte tvar špičky vlákna. V prípade " +"Zavedenie do extrudéra zlyhalo. Skontrolujte tvar konca filamentu. V prípade " "potreby upravte kalibráciu snímača." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "MCU PODPÄŤOVÉ VCC" +msgstr "MCU UNDERVOLTAGE VCC" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 #: ../../Firmware/ultralcd.cpp:1195 msgid "Material changes" -msgstr "Výmen materiálov" +msgstr "Výmena materiálu" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU." -msgstr "Odstráňte vysunuté filament z prednej časti MMU." +msgstr "Odstráňte vysunutý filament z prednej časti MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2535,8 +2535,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selektor sa nemôže pohybovať, pretože FINDA zistila vlákno. Uistite sa, že v" -" prepínači nie je žiadne vlákno a FINDA funguje správne." +"Selektor sa nemôže pohybovať, pretože FINDA zistila filament. Uistite sa, že v" +" selektore nie je žiadny filament a FINDA funguje správne." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2544,7 +2544,7 @@ msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzia firmvéru MMU nekompatibilná s FW tlačiarne. Aktualizácia na " +"Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." #~ msgid "⏬" @@ -2560,7 +2560,7 @@ msgstr "" #~ "The MMU reports its FW version incompatible with the printer's " #~ "firmware. Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "Verzia FW MMU je nekompatibilna s FW tlaciarne. Skontrolujte aktualizacie " +#~ "Verzia FW MMU nie je kompatibilna s FW tlaciarne. Skontrolujte aktualizacie " #~ "MMU firmwaru." #~ msgid "" From 8604c93ccc88fd3eb5c19d00138a7d048095b239 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 13 Mar 2023 09:02:20 +0100 Subject: [PATCH 041/240] Shorten messages as users will contact support anyway --- Firmware/mmu2/errors_list.h | 18 +++++++++--------- lang/po/Firmware.pot | 3 +-- lang/po/Firmware_cs.po | 4 +--- lang/po/Firmware_de.po | 3 +-- lang/po/Firmware_es.po | 4 +--- lang/po/Firmware_fr.po | 3 +-- lang/po/Firmware_hr.po | 3 +-- lang/po/Firmware_hu.po | 4 +--- lang/po/Firmware_it.po | 4 +--- lang/po/Firmware_nl.po | 3 +-- lang/po/Firmware_no.po | 4 +--- lang/po/Firmware_pl.po | 4 +--- lang/po/Firmware_ro.po | 3 +-- lang/po/Firmware_sk.po | 4 +--- lang/po/Firmware_sv.po | 4 +--- 15 files changed, 23 insertions(+), 45 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 145a5b534..11172b957 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -242,25 +242,25 @@ static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); //// //static const char MSG_DESC_PULLEY_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is overheated. Cool down the MMU board and reset MMU."); //static const char MSG_DESC_SELECTOR_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is overheated. Cool down the MMU board and reset MMU."); //static const char MSG_DESC_IDLER_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is overheated. Cool down the MMU board and reset MMU."); -//static const char MSG_DESC_PULLEY_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is not responding. Try resetting the MMU. If the issue persists contact support."); -//static const char MSG_DESC_SELECTOR_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is not responding. Try resetting the MMU. If the issue persists contact support."); -//static const char MSG_DESC_IDLER_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is not responding. Try resetting the MMU. If the issue persists contact support."); +//static const char MSG_DESC_PULLEY_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is not responding. Try resetting the MMU."); +//static const char MSG_DESC_SELECTOR_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is not responding. Try resetting the MMU."); +//static const char MSG_DESC_IDLER_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is not responding. Try resetting the MMU."); //static const char MSG_DESC_PULLEY_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); //static const char MSG_DESC_SELECTOR_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); //static const char MSG_DESC_IDLER_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); //static const char MSG_DESC_PULLEY_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Pulley TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); //static const char MSG_DESC_SELECTOR_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Selector TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); //static const char MSG_DESC_IDLER_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Idler TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_PULLEY_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Pulley TMC driver. Check the wiring and connectors. If the issue persists contact support."); -//static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); -//static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_PULLEY_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Pulley TMC driver. Check the wiring and connectors."); +//static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors."); +//static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors."); //static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 -static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 static const char MSG_DESC_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("Cannot perform the action, filament is already loaded. Unload it first."); ////MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 static const char MSG_DESC_INVALID_TOOL[] PROGMEM_I1 = ISTR("Requested filament tool is not available on this hardware. Check the G-code for tool index out of range (T0-T4)."); ////MSG_DESC_INVALID_TOOL c=20 r=8 static const char MSG_DESC_QUEUE_FULL[] PROGMEM_I1 = ISTR("MMU Firmware internal error, please reset the MMU."); ////MSG_DESC_QUEUE_FULL c=20 r=8 -static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware. If the issue persists, contact support."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detected unexpectedly. Ensure no filament is loaded. Check the sensors and wiring."); ////MSG_DESC_UNLOAD_MANUALLY c=20 r=8 static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index c46172f5c..009ddaa00 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -953,8 +953,7 @@ msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." +"Internal runtime error. Try resetting the MMU or updating the firmware. msgstr "" #. MSG_FILAMENT_LOADED c=20 r=3 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index f159238f9..8f2b2505a 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -982,10 +982,8 @@ msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Interní chyba. Zkuste resetovat MMU ci aktualizujte FW. Pokud pretrvava, " -"kontakujte tech. podporu." +"Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 35f6ae3d1..a6ea4e866 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -993,10 +993,9 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "Interner Laufzeitfehler. MMU zurücksetzen oder Firmware " -"aktualisieren. Ansonsten Support kontaktieren." +"aktualisieren." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index eddeac8d6..8d592eec5 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -993,11 +993,9 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "Error interno de ejecucion. Intenta reiniciar la MMU o actualizar el " -"firmware. Si el problema persiste, ponte en contacto con el servicio " -"tecnico." +"firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 3341ad241..b5184fee2 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1000,10 +1000,9 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "Erreur d'execution interne. Essayez de reinitialiser MMU ou de mettre a jour" -" le FW. Si le probleme persiste, contactez le support." +" le FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index c99de94b5..862d0ec7f 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -992,10 +992,9 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU ili " -"azurirati firmware. Ako se problem nastavi, obratite se podrsci." +"azurirati firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index dda5951e7..118d2ada7 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -995,10 +995,8 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret. Ha a " -"problema fennall, fordulj a supporthoz." +"Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 989e823ff..6d5787c8f 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -996,10 +996,8 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Errore runtime interno. Provare a resettare la MMU o ad aggiornare il " -"FW. Se il problema persiste, contattare l'assistenza." +"Errore runtime interno. Provare a resettare la MMU o ad aggiornare il FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 60829aa60..f25d5837d 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -997,10 +997,9 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "Interne runtime fout. Probeer de MMU te resetten of de firmware bij " -"te werken. Als het probleem aanhoudt, neem dan contact op met support." +"te werken." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 603057977..ffafccdae 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -988,10 +988,8 @@ msgstr "Sett inn filamentet i ekstruderen og deretter trykk inn valghjulet." #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren. " -"Hvis feilen vedvarer, kontakt kundestøtte." +"Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index e25777ec3..8bfdd1318 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -994,10 +994,8 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW. Skontaktuj sie z " -"pomoca techniczna, jeśli problem nadal występuje." +"Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 87ffcd15c..862e407cc 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -995,10 +995,9 @@ msgstr "Infige filamentul (nu-l incarca) in extruder si apasa butonul." #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" "ERR de rulare interna. Incercati sa resetati MMU sau actualizati " -"firmwarul. Daca problema persista, contactati dep. support" +"firmwarul." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index cd7d9e7f0..95a80bbee 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -990,10 +990,8 @@ msgstr "Vlozte filament (nezavadzajte) do extruderu a stlacte tlacidlo" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware. Ak chyba " -"pretrvava, kontaktujte podporu." +"Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index ac89301ce..62c20b526 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -995,10 +995,8 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -" If the issue persists, contact support." msgstr "" -"Internt körtidsfel. Prova återställa MMU eller uppdatera firmware. " -"Kontakta supporten om problemet kvarstår." +"Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 From 3db8233e4dd045fe4252010fe748ef50154ec5d5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 13 Mar 2023 09:03:06 +0100 Subject: [PATCH 042/240] Consistant wording `Tuit` --- 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 f25d5837d..a1cdfd377 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -918,7 +918,7 @@ msgstr "Startpositie" #: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" -"Hotend op 280C! Mondstuk vervangen en aangedraaid volgens specificaties?" +"Hotend op 280C! Tuit vervangen en aangedraaid volgens specificaties?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 From e951a106d6cb36ffa6fc30b8c8d6d3030d4459f9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 08:56:46 +0100 Subject: [PATCH 043/240] Messages fit to pages --- Firmware/Marlin_main.cpp | 4 +-- Firmware/messages.cpp | 8 ++--- Firmware/mmu2/errors_list.h | 8 ++--- Firmware/ultralcd.cpp | 4 +-- lang/po/Firmware.pot | 38 ++++++++++------------ lang/po/Firmware_cs.po | 55 +++++++++++++------------------ lang/po/Firmware_de.po | 56 +++++++++++++------------------- lang/po/Firmware_es.po | 56 +++++++++++++------------------- lang/po/Firmware_fr.po | 46 +++++++++++--------------- lang/po/Firmware_hr.po | 60 +++++++++++++++------------------- lang/po/Firmware_hu.po | 58 ++++++++++++++------------------- lang/po/Firmware_it.po | 56 +++++++++++++------------------- lang/po/Firmware_nl.po | 63 +++++++++++++++--------------------- lang/po/Firmware_no.po | 59 +++++++++++++++------------------- lang/po/Firmware_pl.po | 51 ++++++++++++----------------- lang/po/Firmware_ro.po | 55 +++++++++++++------------------ lang/po/Firmware_sk.po | 64 ++++++++++++++++--------------------- lang/po/Firmware_sv.po | 61 +++++++++++++++-------------------- 18 files changed, 335 insertions(+), 467 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9a3aa66d3..b82105d90 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3431,7 +3431,7 @@ static void mmu_M600_wait_and_beep() { // Beep and wait for user to remove old filament and prepare new filament for load KEEPALIVE_STATE(PAUSED_FOR_USER); - lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament.")); ////MSG_REMOVE_OLD_FILAMENT c=20 r=5 + lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament.")); ////MSG_REMOVE_OLD_FILAMENT c=20 r=4 while (!lcd_clicked()) { manage_heater(); @@ -3533,7 +3533,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float current_position[X_AXIS] -= 100; plan_buffer_line_curposXYZE(FILAMENTCHANGE_XYFEED); st_synchronize(); - lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually.")); ////MSG_CHECK_IDLER c=20 r=5 + lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually.")); ////MSG_CHECK_IDLER c=20 r=4 } M600_load_filament(); } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index d5a57303d..ed8dd4ad5 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -40,7 +40,7 @@ const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////MSG_FI const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////MSG_FINISHING_MOVEMENTS c=20 const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 const char MSG_FSENSOR_RUNOUT[] PROGMEM_I1 = ISTR("F. runout"); ////MSG_FSENSOR_RUNOUT c=13 const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////MSG_FSENSOR_AUTOLOAD c=13 const char MSG_FSENSOR_JAM_DETECTION[] PROGMEM_I1 = ISTR("F. jam detect"); ////MSG_FSENSOR_JAM_DETECTION c=13 @@ -69,9 +69,9 @@ const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////MSG_MMU const char MSG_MMU_POWER_FAILS[] PROGMEM_I1 = ISTR("MMU power fails"); ////MSG_MMU_POWER_FAILS c=15 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////MSG_NO c=4 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////MSG_NOZZLE c=10 -const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////MSG_PAPER c=20 r=10 +const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////MSG_PAPER c=20 r=8 const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////MSG_PAUSE_PRINT c=18 -const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////MSG_PLACE_STEEL_SHEET c=20 r=5 +const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////MSG_PLACE_STEEL_SHEET c=20 r=4 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////MSG_PLEASE_WAIT c=20 const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////MSG_POWER_FAILURES c=15 const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////MSG_PREHEAT_NOZZLE c=20 @@ -139,7 +139,7 @@ const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Continue?"); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3 const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8 const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Continue?"); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10 const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8 const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8 diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 11172b957..44a205666 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -255,17 +255,17 @@ static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); //// //static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors."); //static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors."); //static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 -static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 -static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 +static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=4 static const char MSG_DESC_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("Cannot perform the action, filament is already loaded. Unload it first."); ////MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 static const char MSG_DESC_INVALID_TOOL[] PROGMEM_I1 = ISTR("Requested filament tool is not available on this hardware. Check the G-code for tool index out of range (T0-T4)."); ////MSG_DESC_INVALID_TOOL c=20 r=8 static const char MSG_DESC_QUEUE_FULL[] PROGMEM_I1 = ISTR("MMU Firmware internal error, please reset the MMU."); ////MSG_DESC_QUEUE_FULL c=20 r=8 -static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detected unexpectedly. Ensure no filament is loaded. Check the sensors and wiring."); ////MSG_DESC_UNLOAD_MANUALLY c=20 r=8 static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 00f6878c1..f327fbdc1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4017,7 +4017,7 @@ void lcd_wizard(WizState state) } else { - lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////MSG_ADDITIONAL_SHEETS c=20 r=9 + lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////MSG_ADDITIONAL_SHEETS c=20 r=8 state = S::Restore; } break; @@ -6111,7 +6111,7 @@ static void lcd_detect_IRsensor(){ lcd_show_fullscreen_message_and_wait_P(_i("Sensor verified, remove the filament now."));////MSG_FS_VERIFIED c=20 r=3 fsensor.init(); } else { - lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILED c=20 r=5 + lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILED c=20 r=4 } } #endif //IR_SENSOR_ANALOG diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 009ddaa00..7eefb92a8 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -916,7 +916,7 @@ msgstr "" msgid "INVALID TOOL" msgstr "" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -950,10 +950,10 @@ msgid "" "knob." msgstr "" -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" -"Internal runtime error. Try resetting the MMU or updating the firmware. +"Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" #. MSG_FILAMENT_LOADED c=20 r=3 @@ -1135,23 +1135,19 @@ msgstr "" msgid "MMU load fails" msgstr "" -#. MSG_MMU_POWER_FAILS c=15 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 -msgid "MMU power fails" +msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." +msgid "MMU not responding. Check the wiring and connectors." msgstr "" -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_MMU_POWER_FAILS c=15 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." +msgid "MMU power fails" msgstr "" #. MSG_MAGNETS_COMP c=13 @@ -1368,7 +1364,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1491,7 +1487,7 @@ msgstr "" msgid "Performing cut" msgstr "" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1543,12 +1539,12 @@ msgstr "" msgid "Please load filament first." msgstr "" -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "" -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1725,7 +1721,7 @@ msgstr "" msgid "Recovering print" msgstr "" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -2120,7 +2116,7 @@ msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " @@ -2141,7 +2137,7 @@ msgid "" "chapter)." msgstr "" -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2232,7 +2228,7 @@ msgstr "" msgid "Unloading to pulley" msgstr "" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 8f2b2505a..f5b46cb81 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -942,7 +942,7 @@ msgstr "KONTROLA FINDA" msgid "INVALID TOOL" msgstr "NEPLATNY NASTROJ" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -978,12 +978,11 @@ msgid "" "knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." +msgstr "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1142,23 +1141,15 @@ msgstr "Selhani MMU" msgid "MMU load fails" msgstr "MMU selhani zav" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU neodpovida spravne. Zkontrolujte zapojeni kabelu. Pokud obtize " -"pretrvavaji, kontaktujte podporu." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU neodpovida spravne. Zkontrolujte zapojeni kabelu." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU neodpovida. Zkontrolujte kabely a jejich zapojeni. Pokud potize " -"pretrvavaji, kontaktujte podporu." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU neodpovida. Zkontrolujte kabely a jejich zapojeni." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1486,7 +1477,7 @@ msgstr "Pozastavit tisk" msgid "Performing cut" msgstr "Provadim rez" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1543,12 +1534,12 @@ msgstr "" msgid "Please load filament first." msgstr "Nejdriv zavedte filament" -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Otevrete idler a manualne odstrante filament." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1701,7 +1692,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1743,7 +1734,7 @@ msgstr "Vzadu [µm]" msgid "Recovering print" msgstr "Obnovovani tisku" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." @@ -2165,7 +2156,7 @@ msgstr "" "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni " "vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2245,7 +2236,7 @@ msgstr "Vysunuti k FINDA" msgid "Unloading to pulley" msgstr "Vysunuti ke kladce" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." @@ -2530,14 +2521,14 @@ msgstr "" "Selektor se nemůže pohybovat, protože FINDA detekuje vlákno. Ujistěte se, že" " ve voliči není žádné vlákno a FINDA funguje správně." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na" -" verzi 2.1.9." +"Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " +"2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2552,8 +2543,8 @@ msgstr "" #~ msgstr "Vyberte extruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU hlasi FW nekompatibilni s FW v tiskarne. Ujistete se, ze mate v MMU " #~ "aktualni FW." @@ -2601,8 +2592,8 @@ msgstr "" #~ msgid "MK3 firmware detected on MK3S printer" #~ msgstr "MK3 firmware detekovan na MK3S tiskarne" -#~msgid "MK3S firmware detected on MK3 printer" -#~msgstr "MK3S firmware detekovan na tiskarne MK3" +#~ msgid "MK3S firmware detected on MK3 printer" +#~ msgstr "MK3S firmware detekovan na tiskarne MK3" #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pokracuji v tisku..." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index a6ea4e866..6da056f2e 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -951,7 +951,7 @@ msgstr "INSPIZIERE FINDA" msgid "INVALID TOOL" msgstr "UNGÜLTIGER FIL.PLATZ" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -989,13 +989,12 @@ msgstr "" "Stecken Sie das Filament (nicht laden) in den Extruder und drücken Sie dann " "den Knopf." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" -"Interner Laufzeitfehler. MMU zurücksetzen oder Firmware " -"aktualisieren." +"Interner Laufzeitfehler. MMU zurücksetzen oder Firmware aktualisieren." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1154,24 +1153,18 @@ msgstr "MMU Fehler" msgid "MMU load fails" msgstr "MMU Ladefehler" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." +msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" "MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die " -"Anschlüsse. Wenn das Problem weiterhin besteht, wenden Sie sich an den " -"Support." +"Anschlüsse." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." +msgid "MMU not responding. Check the wiring and connectors." msgstr "" -"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse. Wenn" -" das Problem weiterhin besteht, wenden Sie sich an den Support." +"MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1500,7 +1493,7 @@ msgstr "Druck pausieren" msgid "Performing cut" msgstr "Führe Schnitt aus" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1561,12 +1554,12 @@ msgstr "" msgid "Please load filament first." msgstr "Laden Sie zuerst das Filament." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Spannrolle öffnen und Filament von Hand entfernen" -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1719,7 +1712,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1761,12 +1754,10 @@ msgstr "Hinten [µm]" msgid "Recovering print" msgstr "Druck wiederherst" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Entfernen Sie das alte Filament und drücken Sie den Knopf, um das neue zu " -"laden." +msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2186,7 +2177,7 @@ msgstr "" "Knopf, bis Sie die optimale Höhe erreicht haben. Überprüfen Sie die Bilder " "im Handbuch." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2267,7 +2258,7 @@ msgstr "Entlade zur FINDA" msgid "Unloading to pulley" msgstr "Entlade zur Riemens." -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "" @@ -2542,8 +2533,7 @@ msgstr "Materialwechsel" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU." -msgstr "" -"Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU." +msgstr "Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2559,14 +2549,14 @@ msgstr "" "Selektor kann sich nicht bewegen, da FINDA Fil. erkennt wird. Stelle sicher," " dass sich kein Fil. im Selektor befindet und FINDA ricchtig funktioniert." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Die Firmware-Version der MMU ist mit der FW des Druckers nicht " -"kompatibel. Update auf Version 2.1.9." +"Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " +"Update auf Version 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2581,8 +2571,8 @@ msgstr "" #~ msgstr "Wähle extruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU meldet Inkompatibilität FW. Stell sicher, dass MMU-FW aktuell ist." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 8d592eec5..d4d4d0470 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -952,7 +952,7 @@ msgstr "INSPECCIONAR FINDA" msgid "INVALID TOOL" msgstr "HERR. INVALIDA" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -989,7 +989,7 @@ msgid "" msgstr "" "Inserta el filamento (no lo cargue) en el extrusor y luego presiona el dial." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." @@ -1154,23 +1154,15 @@ msgstr "Fallos MMU" msgid "MMU load fails" msgstr "Carga MMU falla" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"La MMU no responde correcta-mente. Comprueba el cableado y los conectores. " -"Si el problema persiste, contacta con el servicio técnico." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU no responde correctamente. Revise los cables y conectores." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"La MMU no responde. Comprueba el cableado y los conectores. Si el problema " -"persiste, ponte en contacto con el servicio tecnico." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "La MMU no responde. Revise los cables y conectores." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1502,15 +1494,14 @@ msgstr "Pausar impresion" msgid "Performing cut" msgstr "Realizando corte" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Colocar una hoja de papel sobre la superficie de impresion durante la " -"calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar " -"impresora inmediatamente." +"Coloque una hoja de papel debajo de la boquilla durante la calibración de " +"los primeros 4 puntos. Si la boquilla coge el papel, apague inmediatamente." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 @@ -1562,12 +1553,12 @@ msgstr "" msgid "Please load filament first." msgstr "Carga primero el filamento." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Abre el tensor y retira el filamento manualmente." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1720,7 +1711,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro nozzle impresora difiere de cod.G. Continuar?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1762,12 +1753,11 @@ msgstr "Trasera [µm]" msgid "Recovering print" msgstr "Recuper. impresion" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Retira el filamento viejo y presione el dial para comenzar a cargar el nuevo" -" filamento." +"Retira el fil. viejo y presione el dial para comenzar a cargar el nuevo." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2194,7 +2184,7 @@ msgstr "" "que la linea alcance la altura optima. Mira las fotos del manual (Capitulo " "de calibracion)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2275,7 +2265,7 @@ msgstr "Descarga hasta FINDA" msgid "Unloading to pulley" msgstr "Descarga hasta polea" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retira el filamento e intenta nuevamente." @@ -2555,14 +2545,14 @@ msgstr "" "Asegúrese de que no haya fil. en el selector y que FINDA funcione " "correctamente." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." 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." +"La versión de firmware de la MMU es incompatible con el FW de la impresora. " +"Actualizar a la versión 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2574,8 +2564,8 @@ msgstr "" #~ msgstr "Elegir extrusor:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "La MMU informa que su FW no es compatible con el de la impresora. Asegurate " #~ "de que el FW esta actualizado." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b5184fee2..987e1721e 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -958,7 +958,7 @@ msgstr "INSPECTER FINDA" msgid "INVALID TOOL" msgstr "OUTIL INVALIDE" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -996,7 +996,7 @@ msgstr "" "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis " "appuyez sur le bouton." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." @@ -1161,23 +1161,16 @@ msgstr "Echecs MMU" msgid "MMU load fails" msgstr "Def. charg. MMU" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." +msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" -"MMU ne repond pas correctement. Verifiez le cablage et les connecteurs. Si " -"le probleme persiste, contactez le support." +"MMU ne repond pas correctement. Verifiez le cablage et les connecteurs." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU ne repond pas. Verifiez le cablage et les connecteurs. Si le probleme " -"persiste, contactez le support." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU ne repond pas. Verifiez le cablage et les connecteurs." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1508,7 +1501,7 @@ msgstr "Pause de l'impr." msgid "Performing cut" msgstr "Coupe en cours" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1568,12 +1561,12 @@ msgstr "" msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1726,7 +1719,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diamètre de la buse diffère du G-Code. Continuer?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1768,12 +1761,11 @@ msgstr "Arriere [µm]" msgid "Recovering print" msgstr "Recup. impression" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" -"Retirez l'ancien filament puis appuyez sur le bouton pour charger le " -"nouveau." +"Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2197,7 +2189,7 @@ msgstr "" "L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton " "jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2278,7 +2270,7 @@ msgstr "Decharg.t vers FINDA" msgid "Unloading to pulley" msgstr "Dechar.t vers poulie" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." @@ -2567,7 +2559,7 @@ msgstr "" "Le sélecteur ne peut pas bouger car FINDA détecte un filament. Assurez-vous " "qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " @@ -2586,8 +2578,8 @@ msgstr "" #~ msgstr "Choisir extrudeur:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU signale que sa version de FW est incompatible avec le FW de " #~ "l'imprimante. Assurez-vous que le FW du MMU est à jour." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 862d0ec7f..109442860 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -951,7 +951,7 @@ msgstr "PREGLED FINDA" msgid "INVALID TOOL" msgstr "NEVALJAN ALAT" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -988,13 +988,13 @@ msgid "" msgstr "" "Umetnite filament (nemojte ga puniti) u ekstruder i zatim pritisnite gumb." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" -"Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU ili " -"azurirati firmware." +"Interna pogreska vremena izvodjenja. Pokušajte resetirati MMU ili azurirati " +"firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1153,23 +1153,15 @@ msgstr "MMU ne uspijeva" msgid "MMU load fails" msgstr "Neusp. MMU punj" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU ne reagira ispravno. Provjerite ozicenje i konektore. Ako se " -"problem nastavi, obratite se podrsci." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU ne reagira ispravno. Provjerite ozicenje i konektore." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU ne reagira. Provjerite ozicenje i konektore. Ako se problem " -"nastavi, obratite se podrsci." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU ne reagira. Provjerite ozicenje i konektore." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1499,7 +1491,7 @@ msgstr "Pauzirajte print" msgid "Performing cut" msgstr "Izvodjenje reza" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1556,12 +1548,12 @@ msgstr "" msgid "Please load filament first." msgstr "Molimo prvo ubacite filament." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Molimo otvorite klizac i rucno uklonite filament." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1714,7 +1706,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1756,12 +1748,10 @@ msgstr "Zad. str.[µm]" msgid "Recovering print" msgstr "Oporavak printa" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Uklonite stari filament i pritisnite gumb za pocetak stavljanja novog " -"filamenta." +msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2188,7 +2178,7 @@ msgstr "" "Printe ce poceti printati cik-cak liniju. Okrecite gumb dok ne postignete " "optimalnu visinu. Provjerite slike u prirucniku (poglavlje Kalibracija)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2269,7 +2259,7 @@ msgstr "Praznjenje do FINDA" msgid "Unloading to pulley" msgstr "PRAZNJ DO REMENICE" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Provjera nije uspjela, uklonite filament i pokusajte ponovno." @@ -2548,14 +2538,14 @@ msgstr "" "Selektor se ne može pomaknuti jer FINDA otkriva nit. Uvjerite se da niti " "jedna nit nije u selektoru i da FINDA radi ispravno." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na" -" verziju 2.1.9." +"Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " +"2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2567,11 +2557,11 @@ msgstr "" #~ msgstr "Odaberite ekstruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU prijavljuje svoju FW verziju nekompatibilnu s firmwerom " -#~ "printera. Provjerite je li MMU firmware azuriran." +#~ "MMU prijavljuje svoju FW verziju nekompatibilnu s firmwerom printera. " +#~ "Provjerite je li MMU firmware azuriran." #~ msgid "" #~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 118d2ada7..9d7412681 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -953,7 +953,7 @@ msgstr "ELLENŐRIZZE A FINDA" msgid "INVALID TOOL" msgstr "HELYTELEN SZERSZAM" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -991,12 +991,11 @@ msgstr "" "Helyezd be a filamentet az extruderbe (ne toltsd be), majd nyomtd meg a " "gombot." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." +msgstr "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1155,23 +1154,16 @@ msgstr "MMU hibak" msgid "MMU load fails" msgstr "MMU bet. hibak" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." +msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" -"Az MMU helytelenul valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a " -"problema fennall, keresd a supportot." +"Az MMU helytelenul valaszol. Nezd meg a kabelezest es a konnektorokat." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat. Ha a problema" -" fennall, keresd a supportot." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1499,14 +1491,14 @@ msgstr "Nyomtatas szunet" msgid "Performing cut" msgstr "Filament vagas" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Az elso 4 pont kalibracioja alatt tegyel egy papirlapot a fuvoka ala. Ha a " -"fuvoka hozzaer a papirlaphoz, azonnal kapcsold ki a nyomtatot." +"Az elso 4 pont kalibracioja alatt tegyel egy papir- lapot a fuvoka ala. Ha a" +" fuvoka hozzaer a papirlaphoz, azonnal kapcsold ki a nyomtatot." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 @@ -1561,13 +1553,13 @@ msgstr "" msgid "Please load filament first." msgstr "Kerlek eloszor toltsd be a filamentet." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "" "Kerlek, nyisd ki a nyomogorgo ajtajat, es tavolitsd el a filamentet kezzel." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1720,7 +1712,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1760,12 +1752,10 @@ msgstr "Hatso old.[µm]" msgid "Recovering print" msgstr "Nyomt. visszaallit" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Vedd ki a regi filamentet, majd nyomd meg a gombot az uj filament " -"betoltesehez." +msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2188,7 +2178,7 @@ msgstr "" "amig el nem ered az optimalis magassagot. Nezd meg a kepeket a kezikonyv " "Kalibracio fejezeteben." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2269,7 +2259,7 @@ msgstr "Kiadas a FINDAhoz" msgid "Unloading to pulley" msgstr "Kiadas a gorgohoz" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Ellenorzes sikertelen, vedd ki a filamentet es probald ujra." @@ -2552,14 +2542,14 @@ msgstr "" "A választó nem tud mozogni, mert a FINDA fil. észlelt. Győződjön meg arról, " "hogy nincs fil. a választóban, és a FINDA megfelelően működik." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. " -"Frissítés a 2.1.9-es verzióra." +"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " +"2.1.9-es verzióra." #~ msgid "⏬" #~ msgstr "⏬" @@ -2571,8 +2561,8 @@ msgstr "" #~ msgstr "Extruder valasztas:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Az MMU FW verzioja nem kompatibilis a nyomtatoeval. Kerlek frissitsd az MMU " #~ "firmwaret." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 6d5787c8f..0a586ec2f 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -955,7 +955,7 @@ msgstr "ISPEZIONA FINDA" msgid "INVALID TOOL" msgstr "STRUM NON VAL" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -992,7 +992,7 @@ msgid "" msgstr "" "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." @@ -1156,23 +1156,15 @@ msgstr "Fallimenti MMU" msgid "MMU load fails" msgstr "Car MMU falliti" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU non risponde correttamente. Controlla cavi e connettori. Se il " -"problema persiste contatta il supporto." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU non risponde correttamente. Controlla cavi e connettori." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU non risponde. Controlla cavi e connettori. Se il problema persiste" -" contatta il supporto." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU non risponde. Controlla cavi e connettori." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1502,7 +1494,7 @@ msgstr "Metti in pausa" msgid "Performing cut" msgstr "Eseguo taglio" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1561,12 +1553,12 @@ msgstr "" msgid "Please load filament first." msgstr "Carica il filamento, per favore." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1719,7 +1711,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro ugello diverso da G-Code. Continuare?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1761,12 +1753,10 @@ msgstr "Retro [µm]" msgid "Recovering print" msgstr "Recupero stampa" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Rimuovi il filamento precedente e premi la manopola per caricare il nuovo " -"filamento." +msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2191,7 +2181,7 @@ msgstr "" "a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel " "manuale (capitolo sulla calibrazione)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2272,7 +2262,7 @@ msgstr "Scarico in FINDA" msgid "Unloading to pulley" msgstr "Scarico in puleggia" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." @@ -2553,14 +2543,14 @@ msgstr "" "Il selettore non può muoversi perché FINDA rileva un fil. Assicurati che " "nessun fil. sia nel selettore e che FINDA funzioni correttamente." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"La versione del firmware dell MMU non è compatibile con il firmware " -"della stampante. Aggiornamento alla versione 2.1.9." +"La versione del firmware dell MMU non è compatibile con il firmware della " +"stampante. Aggiornamento alla versione 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2572,11 +2562,11 @@ msgstr "" #~ msgstr "Seleziona estrusore:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "La MMU segnala la sua versione FW incompatibile con il FW della " -#~ "stampante. Verifica che il FW della MMU sia aggiornato." +#~ "La MMU segnala la sua versione FW incompatibile con il FW della stampante. " +#~ "Verifica che il FW della MMU sia aggiornato." #~ msgid "" #~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index a1cdfd377..7e31badbc 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -917,8 +917,7 @@ msgstr "Startpositie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "" -"Hotend op 280C! Tuit vervangen en aangedraaid volgens specificaties?" +msgstr "Hotend op 280C! Tuit vervangen en aangedraaid volgens specificaties?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 @@ -956,7 +955,7 @@ msgstr "CONTROLEER FINDA" msgid "INVALID TOOL" msgstr "ONGELDIG TOOL" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -993,13 +992,13 @@ msgid "" msgstr "" "Steek a.u.b. filament (maar niet laden) in de extruder en druk op knop." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" -"Interne runtime fout. Probeer de MMU te resetten of de firmware bij " -"te werken." +"Interne runtime fout. Probeer de MMU te resetten of de firmware bij te " +"werken." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1158,23 +1157,15 @@ msgstr "MMU fout" msgid "MMU load fails" msgstr "MMU laadfout" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU reageert niet correct. Controleer de bedrading en connectoren. " -"Als het probleem aanhoudt, neem dan contact op met support." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU reageert niet correct. Controleer de bedrading en connectoren." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU reageert niet. Controleer de bedrading en connectoren. Als het " -"probleem aanhoudt, neem dan contact op met support." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU reageert niet. Controleer de bedrading en connectoren." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1504,15 +1495,14 @@ msgstr "Print pauzeren" msgid "Performing cut" msgstr "Voer cut uit" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Leg een vel papier onder de tuit tijdens de kalibratie van de eerste 4 " -"punten. Als de tuit het papier beweegt, de printer onmiddellijk " -"uitschakelen." +"Tijdens de kalibratie van de eerste 4 punten leg een vel papier onder de " +"tuit. Als de tuit het papier beweegt, onmiddellijk uitschakelen." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 @@ -1566,12 +1556,12 @@ msgstr "" msgid "Please load filament first." msgstr "Laad a.u.b. eerst filament." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Open spanrol en verwijder filament handmatig." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1724,7 +1714,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1766,7 +1756,7 @@ msgstr "Achterkant[µm]" msgid "Recovering print" msgstr "Print herstellen" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -2198,7 +2188,7 @@ msgstr "" "optimale hoogte hebt bereikt. Bekijk de afbeeldingen in de handleiding " "(Calibration chapter)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2279,7 +2269,7 @@ msgstr "Ontlade naar FINDA" msgid "Unloading to pulley" msgstr "Ontlade n. riemschi." -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verificatie mislukt, verwijder het filament en probeer het opnieuw." @@ -2541,8 +2531,7 @@ msgstr "Materailwisseling." #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU." -msgstr "" -"Verwijder het uitgeworpen filament uit de voorkant van de MMU." +msgstr "Verwijder het uitgeworpen filament uit de voorkant van de MMU." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2558,14 +2547,14 @@ msgstr "" "Selector kan niet bewegen omdat FINDA een filament detecteert. Zorg ervoor " "dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"De firmwareversie van de MMU is niet compatibel met de firmware van " -"de printer. Update naar versie 2.1.9." +"De firmwareversie van de MMU is niet compatibel met de firmware van de " +"printer. Update naar versie 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2577,8 +2566,8 @@ msgstr "" #~ msgstr "Kies extruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "De MMU meldt dat zijn FW-versie niet compatibel is met de firmware van de " #~ "printer. Controleer of de MMU-firmware up-to-date is." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index ffafccdae..bccbc5d3b 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -948,7 +948,7 @@ msgstr "KONTROLLER FINDA" msgid "INVALID TOOL" msgstr "UGYLDIG VERKTØY" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -984,12 +984,11 @@ msgid "" "knob." msgstr "Sett inn filamentet i ekstruderen og deretter trykk inn valghjulet." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." +msgstr "Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1148,23 +1147,15 @@ msgstr "MMU feil" msgid "MMU load fails" msgstr "MMU lastefeil" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU svarer ikke riktig. Sjekk ledninger og koblinger. Hvis problemet " -"vedvarer, kontakt støtte" +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU svarer ikke riktig. Sjekk ledninger og koblinger." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU svarer ikke. Sjekk ledninger og koblinger. Hvis problemet " -"vedvarer, kontakt støtte" +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU svarer ikke. Sjekk ledninger og koblinger." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1493,7 +1484,7 @@ msgstr "Pause printjobben" msgid "Performing cut" msgstr "Utfører kutt" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1544,20 +1535,20 @@ msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" -"Sett inn filament i det første røret bak MMU og trykk valghjulet for" -" å laste." +"Sett inn filament i det første røret bak MMU og trykk valghjulet for å " +"laste." #. MSG_PLEASE_LOAD_PLA c=20 r=4 #: ../../Firmware/ultralcd.cpp:3715 msgid "Please load filament first." msgstr "Vennligst sett inn filament først." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Åpne taljedøren og fjern filamentet for hånd." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1710,7 +1701,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1750,7 +1741,7 @@ msgstr "Baksiden [µm]" msgid "Recovering print" msgstr "Gjenopptar print" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." @@ -2171,7 +2162,7 @@ msgstr "" "optimale høyden. Se bildene i håndboka, under Kalibrering, for hvordan det " "skal se ut." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2252,7 +2243,7 @@ msgstr "Utlaster til FINDA" msgid "Unloading to pulley" msgstr "Utlaster til trinse" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifisering feilet. Fjern filamentet og prøv igjen." @@ -2529,14 +2520,14 @@ msgstr "" "Velgeren kan ikke bevege seg på grunn av at FINDA oppdager en filament. Sørg" " for at ingen fil. er i velgeren og at FINDA fungerer som den skal." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering " -"til versjon 2.1.9." +"MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " +"versjon 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2548,11 +2539,11 @@ msgstr "" #~ msgstr "Velg ekstruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU raporterer at fastvareversjonen ikke er kompatibel med " -#~ "printerens fastvare. Vær sikker på at MMU fastvaren er oppdatert." +#~ "MMU raporterer at fastvareversjonen ikke er kompatibel med printerens " +#~ "fastvare. Vær sikker på at MMU fastvaren er oppdatert." #~ msgid "" #~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 8bfdd1318..a39eab79a 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -952,7 +952,7 @@ msgstr "SPRAWDŹ FINDA" msgid "INVALID TOOL" msgstr "BLEDNE NARZEDZIE" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -990,12 +990,11 @@ msgstr "" "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij " "pokretlo." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." +msgstr "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1154,23 +1153,15 @@ msgstr "Bledy MMU" msgid "MMU load fails" msgstr "Bledy lad. MMU" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU nie dziala. Sprawdz okablowanie i zlacza. Jesli problem nadal wystepuje," -" skontaktuj sie z pomoca techniczna." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU nie dziala. Sprawdz okablowanie i zlacza." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU nie reaguje. Sprawdz okablowanie i zlacza. Jesli problem nadal " -"wystepuje, skontaktuj sie z pomoca techniczna." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU nie reaguje. Sprawdz okablowanie i zlacza." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1500,7 +1491,7 @@ msgstr "Wstrzym. wydruku" msgid "Performing cut" msgstr "Odcinanie" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1558,12 +1549,12 @@ msgstr "" msgid "Please load filament first." msgstr "Najpierw zaladuj filament." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1716,7 +1707,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Srednica dyszy rozni sie od tej w G-code. Kontynuowac?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1758,7 +1749,7 @@ msgstr "Tyl [µm]" msgid "Recovering print" msgstr "Wznawianie wydruku" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." @@ -2186,7 +2177,7 @@ msgstr "" "wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial" " Kalibracja)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2267,7 +2258,7 @@ msgstr "Rozlad. do FINDY" msgid "Unloading to pulley" msgstr "Rozladow. do radelka" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." @@ -2548,14 +2539,14 @@ msgstr "" "Selektor nie może się poruszyć, ponieważ program FINDA wykrył żarnik. " "Upewnij się, że w selektorze nie ma filamentu i że FINDA działa prawidłowo." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem" -" sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." +"Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " +"sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2567,8 +2558,8 @@ msgstr "" #~ msgstr "Wybierz ekstruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "MMU zglasza wersje FW niezgodna z FW drukarki. Upewnij sie, ze FW MMU jest " #~ "aktualne." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 862e407cc..31ca29909 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -955,7 +955,7 @@ msgstr "SPRAWDŹ FINDA" msgid "INVALID TOOL" msgstr "INSTRUMENT INVALID" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -991,13 +991,12 @@ msgid "" "knob." msgstr "Infige filamentul (nu-l incarca) in extruder si apasa butonul." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" -"ERR de rulare interna. Incercati sa resetati MMU sau actualizati " -"firmwarul." +"ERR de rulare interna. Incercati sa resetati MMU sau actualizati firmwarul." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1156,23 +1155,15 @@ msgstr "Erori MMU" msgid "MMU load fails" msgstr "Err. incarc MMU" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU nu raspunde corect. Verificati cablajul si conectorii. Daca " -"problema persista, contactati dep. support" +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU nu raspunde corect. Verificati cablajul si conectorii." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU nu raspunde. Verificati cablajul si conectorii. Daca problema " -"persista, contactati dep. support" +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU nu raspunde. Verificati cablajul si conectorii." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1500,7 +1491,7 @@ msgstr "Pauza print" msgid "Performing cut" msgstr "Efect. taiere" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " @@ -1560,12 +1551,12 @@ msgstr "" msgid "Please load filament first." msgstr "Va rugam incarcati filamentul mai intai." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Deschideti idler-ul si scoateti filamentul manual." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1718,7 +1709,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametrul varfului diferă t de cel din G-code. Continuati?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1760,12 +1751,10 @@ msgstr "Spate [µm]" msgid "Recovering print" msgstr "Recuperare print" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Scoateti filamentul vechi si apasati butonul pentru a incarca filamentul " -"nou." +msgstr "Scoateti fil. vechi si apasati butonul pentru a incarca nou." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2189,7 +2178,7 @@ msgstr "" "Imprimanta va printa o linie zig-zag. Rotiti butonul pana cand ajungeti la " "inaltimea optima. Folositi pozele din handbook (capitolul Calibration)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2270,7 +2259,7 @@ msgstr "Scoatere la FINDA" msgid "Unloading to pulley" msgstr "Scoatere la pully" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verificarea a esuat, scoateti filamentul si incercati din nou." @@ -2554,14 +2543,14 @@ msgstr "" "Asigurați-vă că nu există filament în selector și că FINDA funcționează " "corect." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Versiunea de firmware a MMU este incompatibilă cu FW-ul " -"imprimantei. Actualizați la versiunea 2.1.9." +"Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " +"Actualizați la versiunea 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2573,8 +2562,8 @@ msgstr "" #~ msgstr "Alege extruderul:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Versiune FW MMU este incompatibil cu cea a imprimantei. Asigurati-va ca FW " #~ "MMU este actualizat." diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 95a80bbee..a05cdde4f 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -950,7 +950,7 @@ msgstr "KONTROLA FINDA" msgid "INVALID TOOL" msgstr "INVALID TOOL" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -986,12 +986,11 @@ msgid "" "knob." msgstr "Vlozte filament (nezavadzajte) do extruderu a stlacte tlacidlo" -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." +msgstr "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1150,23 +1149,15 @@ msgstr "Zlyhanie MMU" msgid "MMU load fails" msgstr "MMU zlyhalo" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU neodpoveda spravne. Skontrolujte zapojenie a konektory. Ak chyba " -"pretrvava, kontaktujte podporu." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU neodpoveda spravne.Skontrolujte zapojenie a konektory." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU neodpoveda. Skontrolujte zapojenie a konektory. Ak chyba pretrvava, " -"kontaktujte podporu." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU neodpoveda. Skontrolujte zapojenie a konektory." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1495,15 +1486,14 @@ msgstr "Pozastavit tlac" msgid "Performing cut" msgstr "Strihanie" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" -"Umiestnite list papiera na podlozku a udrzujte ho pod tryskou behom merania " -"prvych 4 bodov. Pokial tryska zachyti papier, okamzite vypnite tlaciaren " -"tlacidlom X." +"Počas kalibrácie prvých 4 bodov umiestnite pod trysku list papiera. Ak " +"tryska zachytí papier, ihneď vypnite tlačiareň." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 @@ -1556,12 +1546,12 @@ msgstr "" msgid "Please load filament first." msgstr "Prosim najskor zavedte filament" -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Prosim otvorte idler a manualne odstrante filament." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1714,7 +1704,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Priemer trysky tlaciarne sa lisi od G-code. Pokracovat?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1756,7 +1746,7 @@ msgstr "Zadna str.[µm]" msgid "Recovering print" msgstr "Obnovovanie tlace" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyberte stary filament a stlacte tlacidlo pre zavedenie noveho." @@ -2178,7 +2168,7 @@ msgstr "" "Tlaciaren zacne tlacit lomenu ciaru. Otacanim tlacidla nastavte optimalnu " "vysku. Postupujte podla obrazku v handbooku (kapitola Kalibracia)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2259,7 +2249,7 @@ msgstr "Vysuvanie do FINDA" msgid "Unloading to pulley" msgstr "Vysuv. do remenice" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Overenie zlyhalo, vyberte filament a skuste znovu." @@ -2489,8 +2479,8 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Neočakávane zistený filament. Uistite sa, že nie je vložený žiadny " -"filament. Skontrolujte snímače a kabeláž." +"Neočakávane zistený filament. Uistite sa, že nie je vložený žiadny filament." +" Skontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 @@ -2503,8 +2493,8 @@ msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." msgstr "" -"Zavedenie do extrudéra zlyhalo. Skontrolujte tvar konca filamentu. V prípade " -"potreby upravte kalibráciu snímača." +"Zavedenie do extrudéra zlyhalo. Skontrolujte tvar konca filamentu. V prípade" +" potreby upravte kalibráciu snímača." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 @@ -2533,10 +2523,10 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"Selektor sa nemôže pohybovať, pretože FINDA zistila filament. Uistite sa, že v" -" selektore nie je žiadny filament a FINDA funguje správne." +"Selektor sa nemôže pohybovať, pretože FINDA zistila filament. Uistite sa, že" +" v selektore nie je žiadny filament a FINDA funguje správne." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " @@ -2555,8 +2545,8 @@ msgstr "" #~ msgstr "Zvolte extruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" #~ "Verzia FW MMU nie je kompatibilna s FW tlaciarne. Skontrolujte aktualizacie " #~ "MMU firmwaru." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 62c20b526..aaf6121ac 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -953,7 +953,7 @@ msgstr "KONTROLLERA FINDA" msgid "INVALID TOOL" msgstr "OGILTIGT VERKTYG" -#. MSG_ADDITIONAL_SHEETS c=20 r=9 +#. MSG_ADDITIONAL_SHEETS c=20 r=8 #: ../../Firmware/ultralcd.cpp:4015 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " @@ -991,12 +991,11 @@ msgstr "" "Infoga filamentet (ladda inte in det) i extrudern och tryck sedan på " "knappen." -#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=11 +#. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." -msgstr "" -"Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." +msgstr "Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." #. MSG_FILAMENT_LOADED c=20 r=3 #: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 @@ -1155,23 +1154,15 @@ msgstr "MMU felar" msgid "MMU load fails" msgstr "MMU-laddn felar" -#. MSG_DESC_COMMUNICATION_ERROR c=20 r=9 +#. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 -msgid "" -"MMU not responding correctly. Check the wiring and connectors. If the " -"issue persists, contact support." -msgstr "" -"MMU svarar inte korrekt. Kontrollera kablarna och kontakterna.Om " -"problemet kvarstår, kontakta supporten." +msgid "MMU not responding correctly. Check the wiring and connectors." +msgstr "MMU svarar inte korrekt. Kontrollera kablarna och kontakterna." -#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=8 +#. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 #: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 -msgid "" -"MMU not responding. Check the wiring and connectors. If the issue " -"persists, contact support." -msgstr "" -"MMU svarar inte. Kontrollera kablarna och kontakterna.Om problemet " -"kvarstår, kontakta supporten." +msgid "MMU not responding. Check the wiring and connectors." +msgstr "MMU svarar inte. Kontrollera kablarna och kontakterna." #. MSG_MMU_CONNECTED c=18 #: ../../Firmware/ultralcd.cpp:1658 @@ -1501,14 +1492,14 @@ msgstr "Pausa utskrift" msgid "Performing cut" msgstr "Utför skärning" -#. MSG_PAPER c=20 r=10 +#. MSG_PAPER c=20 r=8 #: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 msgid "" "Place a sheet of paper under the nozzle during the calibration of first 4 " "points. If the nozzle catches the paper, power off the printer immediately." msgstr "" "Placera ett pappersark under munstycket under kalibreringen av de första 4 " -"punkterna. Stäng av skrivaren omedelbart om munstycket rör vid pappret.." +"punkterna. Om munstycket fångar papperet, stäng av omedelbart." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 @@ -1561,12 +1552,12 @@ msgstr "" msgid "Please load filament first." msgstr "Vänligen ladda filament först." -#. MSG_CHECK_IDLER c=20 r=5 +#. MSG_CHECK_IDLER c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3536 msgid "Please open idler and remove filament manually." msgstr "Öppna idler och ta bort filamentet manuellt." -#. MSG_PLACE_STEEL_SHEET c=20 r=5 +#. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 #: ../../Firmware/ultralcd.cpp:3942 msgid "Please place steel sheet on heatbed." @@ -1719,7 +1710,7 @@ msgstr "" msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?" -#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9 +#. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." @@ -1761,12 +1752,10 @@ msgstr "Baksida [µm]" msgid "Recovering print" msgstr "Återställer utskrift" -#. MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#. MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: ../../Firmware/Marlin_main.cpp:3434 msgid "Remove old filament and press the knob to start loading new filament." -msgstr "" -"Ta bort det gamla filamentet och tryck på knappen för att börja ladda nytt " -"filament." +msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt." #. MSG_RENAME c=18 #: ../../Firmware/ultralcd.cpp:5279 @@ -2187,7 +2176,7 @@ msgstr "" "Skrivaren börjar skriva ut en sicksacklinje. Vrid vredet tills du nar " "optimal höjd. Kontrollera med bilderna i handboken (Kalibreringskapitlet)." -#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 #: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " @@ -2268,7 +2257,7 @@ msgstr "Laddar ur till FINDA" msgid "Unloading to pulley" msgstr "Ladd ur t. remskiva" -#. MSG_FIL_FAILED c=20 r=5 +#. MSG_FIL_FAILED c=20 r=4 #: ../../Firmware/ultralcd.cpp:6109 msgid "Verification failed, remove the filament and try again." msgstr "Verifieringen felade, ta bort filamentet, försök igen." @@ -2544,14 +2533,14 @@ msgstr "" "Väljaren kan inte röra sig på grund av att FINDA detekterar en filament. Se " "till att inget glödtråd är i väljaren och att FINDA fungerar korrekt." -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=9 +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering " -"till version 2.1.9." +"MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " +"version 2.1.9." #~ msgid "⏬" #~ msgstr "⏬" @@ -2563,11 +2552,11 @@ msgstr "" #~ msgstr "Välj extruder:" #~ msgid "" -#~ "The MMU reports its FW version incompatible with the printer's " -#~ "firmware. Make sure the MMU firmware is up to date." +#~ "The MMU reports its FW version incompatible with the printer's firmware. " +#~ "Make sure the MMU firmware is up to date." #~ msgstr "" -#~ "MMU rapporterar att FW-versionen är inkompatibelmed din skrivare. " -#~ "Säkerställ att MMU-firmwaren är aktuell." +#~ "MMU rapporterar att FW-versionen är inkompatibelmed din skrivare. Säkerställ" +#~ " att MMU-firmwaren är aktuell." #~ msgid "" #~ "Unexpected FINDA reading. Ensure no filament is under FINDA and the selector" From ce1c059ade8c639417df45e5601136bfb6e41ead Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 09:04:07 +0100 Subject: [PATCH 044/240] update pot and po files --- lang/po/Firmware.pot | 846 ++++++++++++++++++++--------------------- lang/po/Firmware_cs.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_de.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_es.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_fr.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_hr.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_hu.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_it.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_nl.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_no.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_pl.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_ro.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_sk.po | 842 ++++++++++++++++++++-------------------- lang/po/Firmware_sv.po | 842 ++++++++++++++++++++-------------------- 14 files changed, 5896 insertions(+), 5896 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 7eefb92a8..f43412179 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -19,81 +19,81 @@ msgid " 0.4 or newer" msgstr "" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr "" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -105,27 +105,27 @@ msgid "Avoiding grind" msgstr "" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "" @@ -142,7 +142,7 @@ msgid "Bed done" msgstr "" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "" @@ -158,18 +158,18 @@ msgid "" msgstr "" #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "" @@ -180,13 +180,13 @@ msgid "Blackout occurred. Recover print?" msgstr "" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "" @@ -196,17 +196,17 @@ msgid "COMMUNICATION ERROR" msgstr "" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -214,29 +214,29 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "" @@ -253,120 +253,120 @@ msgid "" msgstr "" #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "" #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "" @@ -376,7 +376,7 @@ msgid "Crash detected." msgstr "" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -384,24 +384,24 @@ msgid "" msgstr "" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "" @@ -411,7 +411,7 @@ msgid "Disable" msgstr "" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "" @@ -432,7 +432,7 @@ msgid "" msgstr "" #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -444,7 +444,7 @@ msgid "Done" msgstr "" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "" @@ -473,13 +473,13 @@ msgid "ERR Wait for User" msgstr "" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "" @@ -491,17 +491,17 @@ msgid "Ejecting filament" msgstr "" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "" @@ -513,30 +513,30 @@ msgid "Engaging idler" msgstr "" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "" @@ -575,8 +575,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "" @@ -601,36 +601,36 @@ msgid "FW RUNTIME ERROR" msgstr "" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "" @@ -659,23 +659,23 @@ msgid "Feeding to nozzle" msgstr "" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "" @@ -687,20 +687,20 @@ msgid "" msgstr "" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "" @@ -726,58 +726,58 @@ msgid "" msgstr "" #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "" @@ -820,13 +820,13 @@ msgid "" msgstr "" #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "" @@ -848,7 +848,7 @@ msgid "Heating done." msgstr "" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -856,16 +856,16 @@ msgid "" msgstr "" #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "" @@ -876,23 +876,23 @@ msgid "Homing" msgstr "" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "" @@ -917,7 +917,7 @@ msgid "INVALID TOOL" msgstr "" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -929,22 +929,22 @@ msgid "Improving bed calibration point" msgstr "" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -957,14 +957,14 @@ msgid "" msgstr "" #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "" @@ -979,87 +979,87 @@ msgid "LOAD TO EXTR. FAILED" msgstr "" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "" @@ -1071,13 +1071,13 @@ msgid "" msgstr "" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "" @@ -1097,8 +1097,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "" @@ -1108,7 +1108,7 @@ msgid "MMU NOT RESPONDING" msgstr "" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "" @@ -1119,61 +1119,61 @@ msgid "MMU SELFTEST FAILED" msgstr "" #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 msgid "MMU not responding. Check the wiring and connectors." msgstr "" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "" @@ -1184,36 +1184,36 @@ msgid "Measuring reference height of calibration point" msgstr "" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "" #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "" @@ -1234,28 +1234,28 @@ msgid "More details online." msgstr "" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "" @@ -1267,10 +1267,10 @@ msgstr "" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "" @@ -1280,14 +1280,14 @@ msgid "New firmware version available:" msgstr "" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "" @@ -1297,65 +1297,65 @@ msgid "No move." msgstr "" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "" #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "" #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "" @@ -1379,15 +1379,15 @@ msgstr "" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "" @@ -1398,19 +1398,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "" @@ -1420,40 +1420,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1471,13 +1471,13 @@ msgid "Parking selector" msgstr "" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "" @@ -1495,24 +1495,24 @@ msgid "" msgstr "" #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "" @@ -1522,20 +1522,20 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "" #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "" @@ -1546,7 +1546,7 @@ msgstr "" #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "" @@ -1557,12 +1557,12 @@ msgid "Please press the knob to unload filament" msgstr "" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "" @@ -1578,7 +1578,7 @@ msgid "Please run XYZ calibration first." msgstr "" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "" @@ -1590,49 +1590,49 @@ msgstr "" #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "" #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "" @@ -1643,7 +1643,7 @@ msgid "Preparing blade" msgstr "" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "" @@ -1653,33 +1653,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "" #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "" @@ -1707,12 +1707,12 @@ msgid "QUEUE FULL" msgstr "" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "" @@ -1732,7 +1732,7 @@ msgid "Remove the ejected filament from the front of the MMU." msgstr "" #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "" @@ -1744,24 +1744,24 @@ msgid "" msgstr "" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "" @@ -1783,12 +1783,12 @@ msgid "Returning selector" msgstr "" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "" @@ -1798,15 +1798,15 @@ msgid "RstMMU" msgstr "" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" msgstr "" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "" @@ -1832,12 +1832,12 @@ msgid "Searching bed calibration point" msgstr "" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1846,23 +1846,23 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "" @@ -1880,28 +1880,28 @@ msgid "" msgstr "" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "" @@ -1911,30 +1911,30 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "" #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "" @@ -1945,7 +1945,7 @@ msgid "Sheet" msgstr "" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1954,18 +1954,18 @@ msgid "" msgstr "" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "" @@ -1982,8 +1982,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "" @@ -1994,20 +1994,20 @@ msgid "Sorting files" msgstr "" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "" @@ -2017,19 +2017,19 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "" @@ -2039,24 +2039,24 @@ msgid "Stop" msgstr "" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "" @@ -2096,17 +2096,17 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "" #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "" @@ -2130,7 +2130,7 @@ msgid "" msgstr "" #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2145,7 +2145,7 @@ msgid "" msgstr "" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2157,39 +2157,39 @@ msgid "Thermal model not calibrated yet." msgstr "" #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "" @@ -2204,15 +2204,15 @@ msgid "Unload" msgstr "" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "" @@ -2229,12 +2229,12 @@ msgid "Unloading to pulley" msgstr "" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "" #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "" @@ -2245,7 +2245,7 @@ msgid "WARNING TMC TOO HOT" msgstr "" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2259,18 +2259,18 @@ msgid "Wait for user..." msgstr "" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "" @@ -2295,133 +2295,133 @@ msgid "Was filament unload successful?" msgstr "" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "" @@ -2431,7 +2431,7 @@ msgid "unknown state" msgstr "" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index f5b46cb81..0217f23e4 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s ocekavana verze" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Doladeni Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Vse OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Vse je hotovo. Tisku zdar!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Okoli" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,27 +116,27 @@ msgid "Avoiding grind" msgstr "Eliminace obrouseni" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Osa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Delka osy" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Zpet" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Podlozka" @@ -153,7 +153,7 @@ msgid "Bed done" msgstr "Bed OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -170,18 +170,18 @@ msgstr "" "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Podlozka/Topeni" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Stav remenu" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test remenu" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu. Obnovit tisk?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Podsviceni" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "CHYBA KOMUNIKACE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibruji Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" "tlacitkem." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibruji vychozi p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibrace" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibrace OK" @@ -269,120 +269,120 @@ msgid "" msgstr "Nelze provest akci, filament je zaveden. Nejprve jej vyjmete." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Karta vyjmuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Vymente SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Vymenit filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Zmena uspesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Kontrola osy X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Kontrola osy Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Kontrola osy Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Kontroluji soubor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Kontrola senzoru" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Kontrola" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Vymazat chybu TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Barva neni cista" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Komunitni prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Pokr." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Zchladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Det. narazu" @@ -392,7 +392,7 @@ msgid "Crash detected." msgstr "Detekovan naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +403,24 @@ msgstr "" "Normal modu" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Ustrihnout" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Strihani" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Temny" @@ -430,7 +430,7 @@ msgid "Disable" msgstr "Vypnout" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Vypnout motory" @@ -453,7 +453,7 @@ msgstr "" "manualu, kapitola Zaciname." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -467,7 +467,7 @@ msgid "Done" msgstr "Konec" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Korekce E:" @@ -496,7 +496,7 @@ msgid "ERR Wait for User" msgstr "ERR: Cekam na uziv." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "CHYBA:" @@ -508,17 +508,17 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Konc. spinace" @@ -530,30 +530,30 @@ msgid "Engaging idler" msgstr "Zapinani idleru" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Det. zaseku" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. runout" @@ -591,8 +591,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ZASEK. FILAM." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS reakce" @@ -617,36 +617,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME CHYBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Selhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Selhani MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falesne spusteni" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventilatoru" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Kontr. vent." @@ -675,41 +675,41 @@ msgid "Feeding to nozzle" msgstr "Zavadim do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Filament nezaveden" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -741,42 +741,42 @@ msgstr "" "nejsou necistoty. Ujistete se, ze senzor funguje spravne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Spotrebovano filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Dokoncovani pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Kal. prvni vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri " "sestaveni tiskarny." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Prutok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -785,18 +785,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Predni tiskovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Vpredu [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Predni/levy vent." @@ -842,13 +842,13 @@ msgid "" msgstr "G-code je pripraven pro novejsi FW. Aktualizujte FW. Tisk zrusen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW nastaveni" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" @@ -870,7 +870,7 @@ msgid "Heating done." msgstr "Zahrivani OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -880,7 +880,7 @@ msgstr "" "nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -889,9 +889,9 @@ msgstr "" "kalibracnim procesem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Vys. vykon" @@ -902,23 +902,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" 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:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Vent. hotendu:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." @@ -943,7 +943,7 @@ msgid "INVALID TOOL" msgstr "NEPLATNY NASTROJ" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -957,22 +957,22 @@ msgid "Improving bed calibration point" msgstr "Upresnovani kalibracniho bodu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Informace" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Zav. SD karty" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -985,14 +985,14 @@ msgid "" msgstr "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Je filament zaveden?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" @@ -1002,98 +1002,98 @@ msgid "Iteration" msgstr "Opakovani" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Posledni tisk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Selhani posl. tisku" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Vlevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Vlevo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Normalni" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Ztlumeny" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Korekce lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Doladeni osy Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Nacist vse" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Zavest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Zavest do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Zatěžovací test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Cisteni barvy" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Zavadeni filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Uvolnena remenicka" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Hlasity" @@ -1108,8 +1108,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interni chyba MMU FW, resetujte MMU" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU mod" @@ -1119,7 +1119,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEODPOVIDA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU opakovani: Obnova teploty..." @@ -1130,14 +1130,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST SELAHL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Selhani MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU selhani zav" @@ -1152,28 +1152,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpovida. Zkontrolujte kabely a jejich zapojeni." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU pripojeno" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Hlavni nabidka" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Merene zkos." @@ -1184,36 +1184,36 @@ msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Probiha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1234,28 +1234,28 @@ msgid "More details online." msgstr "Vice info na webu" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Posunout X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Posunout Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Posunout Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Posunout osu" @@ -1267,10 +1267,10 @@ msgstr "Presun selektoru" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1280,14 +1280,14 @@ msgid "New firmware version available:" msgstr "Vysla nova verze FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Zadna SD karta" @@ -1297,65 +1297,65 @@ msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Zadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nezapojeno" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Netoci se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Nyni zkalibruji vzdalenost mezi koncem trysky a povrchem podlozky." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Výměna trysek" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Tryska" @@ -1367,15 +1367,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Vyp" @@ -1386,19 +1386,19 @@ msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Jednou" @@ -1408,40 +1408,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "STOP: CHYBA TEPLOTY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibrace" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Nahrivani PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA kalibrace selhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1461,13 +1461,13 @@ msgid "Parking selector" msgstr "KLADKA SE NEOTACI" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pozastavit tisk" @@ -1487,7 +1487,7 @@ msgstr "" "prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1496,17 +1496,17 @@ msgstr "" "restartovanim tiskarny." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Zkontrolujte zapojeni IR senzoru a vyjmuty filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Zkontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Ocistete podlozku a stisknete tlacitko." @@ -1516,13 +1516,13 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete trysku. Potvrdte tlacitkem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Vlozte filament do extruderu a stiskem tlacitka jej zavedete." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1530,7 +1530,7 @@ msgstr "" "Vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Nejdriv zavedte filament" @@ -1541,7 +1541,7 @@ msgstr "Otevrete idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Umistete tiskovy plat na podlozku" @@ -1552,12 +1552,12 @@ msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete tlacitko" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Vyjmete urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Nejprve sundejte transportni soucastky." @@ -1573,7 +1573,7 @@ msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Vyjmete filament a zopakujte tuto akci" @@ -1585,49 +1585,49 @@ msgstr "Prosim aktualizujte." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Cekejte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Vypadky proudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Predehrev" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Vyckejte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Predehrev ke strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Predehrev k zavedeni" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" @@ -1638,7 +1638,7 @@ msgid "Preparing blade" msgstr "Pripravuji cepel" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Stisknete tlacitko" @@ -1648,33 +1648,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Tisk prerusen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Tiskovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Tisk z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Tisk pozastaven" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Cas tisku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "IP adr. tiskarny:" @@ -1720,12 +1720,12 @@ msgid "QUEUE FULL" msgstr "FRONTA PLNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Vzadu [µm]" @@ -1740,7 +1740,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Prejmenovat" @@ -1754,24 +1754,24 @@ msgstr "" "nastrojovy index mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Obnoveni tisku" @@ -1793,17 +1793,17 @@ msgid "Returning selector" msgstr "Vracim selektor" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Vpravo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1812,8 +1812,8 @@ msgstr "" "kalibracni proces od zacatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD karta" @@ -1839,12 +1839,12 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1853,23 +1853,23 @@ msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." @@ -1880,28 +1880,28 @@ msgid "Selecting fil. slot" msgstr "Vyber fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Start Selftestu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Chyba Selftestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Selftest selhal" @@ -1911,30 +1911,30 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Nastaveni" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Tezke zkos." @@ -1945,7 +1945,7 @@ msgid "Sheet" msgstr "Plat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1958,18 +1958,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Tichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Lehke zkos." @@ -1988,8 +1988,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Trideni" @@ -2000,20 +2000,20 @@ msgid "Sorting files" msgstr "Trideni souboru" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Toci se" @@ -2023,19 +2023,19 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Tiskove platy" @@ -2045,24 +2045,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Zastavit tisk" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Prohozene" @@ -2102,7 +2102,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC CHYBA NIZKE NAP." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2116,17 +2116,17 @@ msgid "Thermal model not calibrated yet." msgstr "Termálního model zatím nebyl kalibrován." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Testovani filamentu" @@ -2147,7 +2147,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2165,39 +2165,39 @@ msgstr "" "Je potreba kalibrovat osu Z. Postupujte dle prirucky, kapitola Zaciname." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Celkem" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Celkem selhani" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filament celkem" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Celkovy cas tisku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Ladit" @@ -2212,15 +2212,15 @@ msgid "Unload" msgstr "Vyjmout" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Vyjmout filament" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Vysouvam filament" @@ -2237,12 +2237,12 @@ msgid "Unloading to pulley" msgstr "Vysunuti ke kladce" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Napeti" @@ -2253,7 +2253,7 @@ msgid "WARNING TMC TOO HOT" msgstr "TMC: VYSOKA TEPLOTA!" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2271,18 +2271,18 @@ msgid "Wait for user..." msgstr "Ceka se na uzivatele" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Varovat" @@ -2307,137 +2307,137 @@ msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Chyba zapojeni" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Pruvodce" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Korekce X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte " "tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y vzdalenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Korekce Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete znovu spustit z menu Kalibrace -> Pruvodce." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Korekce Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Pocet mereni Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "a stisknete tlacitko" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "k zavedeni filamentu" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "k vyjmuti filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "neznamy" @@ -2447,19 +2447,19 @@ msgid "unknown state" msgstr "neznamy stav" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Obnovit" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU vyp. proudu" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Vysunutí z MMU" @@ -2497,8 +2497,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU PODPĚTÍ VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Výměn materiálů" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 6da056f2e..49199a45f 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 oder neuer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s Level erwartet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Abbruch" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Z Anpassen:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Alles richtig" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spaß beim Drucken!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Immer" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Raumtemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Startposition" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Auto Leist" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "AutoLaden Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,27 +116,27 @@ msgid "Avoiding grind" msgstr "Vermeide schleifen" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Achse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Achsenlänge" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Zurück" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Bett" @@ -153,7 +153,7 @@ msgid "Bed done" msgstr "Bett OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Bett Level Korr." @@ -171,18 +171,18 @@ msgstr "" "Reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Bett/Heizung" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Gurtstatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Riementest" @@ -193,13 +193,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Hell" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Helligkeit" @@ -209,17 +209,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEHLER" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrierung Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -229,12 +229,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibriere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,17 +243,17 @@ msgstr "" "Anschliessend den Knopf drücken." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibriere Start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibrierung" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibrierung OK" @@ -272,120 +272,120 @@ msgstr "" "Entladen Sie es zuerst." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "SD Karte entfernt" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Wechsel SD Karte" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Filament-Wechsel" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Wechsel erfolgr.!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Wechsel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Prüfe X Achse" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Prüfe Y Achse" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Prüfe Z Achse" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Prüfe Bett" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Prüfe Endschalter" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Überprüfe Datei" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Prüfe Düse" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Prüfe Sensoren" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Kontrolle" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "TM Fehler löschen" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Falsche Farbe" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Von der Community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Weit." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Abkühlen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Gewählte Sprache kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Crash Erk." @@ -395,7 +395,7 @@ msgid "Crash detected." msgstr "Crash erkannt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +406,24 @@ msgstr "" "genutzt werden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Fil. schneiden" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Messer" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Dimm" @@ -433,7 +433,7 @@ msgid "Disable" msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Motoren aus" @@ -456,7 +456,7 @@ msgstr "" "eingestellt. Folgen Sie dem Handbuch, Kapitel Erste Schritte." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +469,7 @@ msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-Korrektur:" @@ -498,7 +498,7 @@ msgid "ERR Wait for User" msgstr "FEHL. Warte Benutzer" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "FEHLER:" @@ -510,17 +510,17 @@ msgid "Ejecting filament" msgstr "Werfe Filament aus" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Endanschlag" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Ende nicht getroffen" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Endschalter" @@ -532,30 +532,30 @@ msgid "Engaging idler" msgstr "Spannrol. einkuppeln" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder Info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F. Stau entd." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "FS. Auslauf" @@ -593,8 +593,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA NICHT FIL.FREI" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS Aktion" @@ -619,36 +619,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW-LAUFZEITFEHLER" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Fehlerstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "MMU-Fehler" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falschtriggerung" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Lüfter-Tempo" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Lüftertest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Lüfter Check" @@ -677,41 +677,41 @@ msgid "Feeding to nozzle" msgstr "Zufuhr zur Düse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. Mängel" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. nicht geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Filamentsensor" @@ -744,42 +744,42 @@ msgstr "" "dass nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Filament benutzt" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollständig Trotzdem fortfahren?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Bewegung beenden" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Erste-Schicht Kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Zunächst führe ich den Selbsttest durch, um die häufigsten Probleme beim " "Zusammenbau zu überprüfen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Durchfluss" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -788,18 +788,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Drucklüfter?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Vorne [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Druck/Extr. Lüfter" @@ -848,13 +848,13 @@ msgstr "" "Druck abgebrochen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW Einstellungen" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" @@ -876,7 +876,7 @@ msgid "Heating done." msgstr "Aufwärmen OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -887,7 +887,7 @@ msgstr "" "Danach können Sie drucken." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -896,9 +896,9 @@ msgstr "" "durch den Einricht- ungsablauf führe?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Hohe leist" @@ -909,25 +909,25 @@ msgid "Homing" msgstr "Startposition" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend bei 280C! Düse gewechselt, gemäß Spezifikation angezogen?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend-Lüfter:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" "Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 " "Min.dauern." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchführen." @@ -952,7 +952,7 @@ msgid "INVALID TOOL" msgstr "UNGÜLTIGER FIL.PLATZ" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -966,22 +966,22 @@ msgid "Improving bed calibration point" msgstr "Verbesserung des Bettkalibrierungs- punkts" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Infoanzeige" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. SD Karte" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Filament einlegen" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +997,14 @@ msgstr "" "Interner Laufzeitfehler. MMU zurücksetzen oder Firmware aktualisieren." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" @@ -1014,98 +1014,98 @@ msgid "Iteration" msgstr "Wiederholung" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Letzter Druck" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Letzte Druckfehler" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Extruderlüfter?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Links [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Hell.wert" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Dimmwert" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Lineare Korrektur" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Z einstellen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Alle laden" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "In Düse laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Lade Filament Test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Lade Farbe" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Filament lädt" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Lose Riemenscheibe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Laut" @@ -1120,8 +1120,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware Fehler, setzen Sie die MMU zurück." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU Mod." @@ -1131,7 +1131,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGIERT NICHT" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU-Neuversuch: Wiederherstelle die Temperatur..." @@ -1142,14 +1142,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELBSTTEST FEHL." #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU Fehler" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU Ladefehler" @@ -1167,28 +1167,28 @@ msgstr "" "MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU verbunden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnet Komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Hauptmenü" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Schräglauf" @@ -1199,36 +1199,36 @@ msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhöhe des Kalibrierpunktes" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Gitter" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Moduswechsel erfolgt..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modell" @@ -1249,28 +1249,28 @@ msgid "More details online." msgstr "Weiter Details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Bewege X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Bewege Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Bewege Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Achse bewegen" @@ -1282,10 +1282,10 @@ msgstr "Bewege Selektor" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/V" @@ -1295,14 +1295,14 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfügbar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nein" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Keine SD Karte" @@ -1312,65 +1312,65 @@ msgid "No move." msgstr "Keine Bewegung." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Ohne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nicht angeschlossen" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Dreht sich nicht" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt kalibriere ich den Abstand zwischen Düsenspitze und Druckbett." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Düse für PLA vorheizen." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Düse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Düsenwechsel" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Düsen Dia." @@ -1382,15 +1382,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Aus" @@ -1402,19 +1402,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "An" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Einmal" @@ -1424,40 +1424,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSE THERM. FEHLER" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID Kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID Kalib. fertig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID Kalibrierung" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA erwärmen" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA Kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA-Kalibrierung fehlgeschlagen" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1477,13 +1477,13 @@ msgid "Parking selector" msgstr "Parke Selektor" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Druck pausieren" @@ -1503,7 +1503,7 @@ msgstr "" "ersten 4 Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1512,17 +1512,17 @@ msgstr "" "dem Assistenten fort, indem Sie den Drucker neu starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "IR Sensor Verbindungen über- prüfen. Ist Filament entladen?" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Prüfen:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Reinigen Sie das Heizbett und drücken Sie dann den Knopf." @@ -1533,7 +1533,7 @@ msgstr "" "Entfernen Sie überstehendes Filament von der Düse. Klicken wenn sauber." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1541,7 +1541,7 @@ msgstr "" "laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1550,7 +1550,7 @@ msgstr "" "den Knopf, um es zu laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Laden Sie zuerst das Filament." @@ -1561,7 +1561,7 @@ msgstr "Spannrolle öffnen und Filament von Hand entfernen" #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Legen Sie das Stahlblech auf das Heizbett." @@ -1572,12 +1572,12 @@ msgid "Please press the knob to unload filament" msgstr "Drücken Sie den Knopf um das Filament zu entladen." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Ziehen Sie das Filament sofort heraus" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Zuerst Transportsicherungen entfernen." @@ -1593,7 +1593,7 @@ msgid "Please run XYZ calibration first." msgstr "Zuerst XYZ Kalibrierung ausführen." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Entladen Sie erst das Filament und versuchen Sie es nochmal." @@ -1605,49 +1605,49 @@ msgstr "Bitte aktualisieren." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Warten" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Netzfehler" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Vorheizen" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Düse vorheizen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Düse. Bitte warten." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Heizen zum Laden" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Heizen zum Entladen" @@ -1658,7 +1658,7 @@ msgid "Preparing blade" msgstr "Bereite Messer vor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Knopf drücken zum" @@ -1668,33 +1668,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Druck abgebrochen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Drucklüfter:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Drucken von SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Druck pausiert" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Druckzeit" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Drucker IP Adr.:" @@ -1740,12 +1740,12 @@ msgid "QUEUE FULL" msgstr "QUEUE VOLL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Hinten [µm]" @@ -1760,7 +1760,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Umbenennen" @@ -1774,24 +1774,24 @@ msgstr "" "Prüfen Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Druck fortsetzen" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Druck fortgesetzt" @@ -1813,17 +1813,17 @@ msgid "Returning selector" msgstr "Selektor zurückfahr." #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Rechts [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1832,8 +1832,8 @@ msgstr "" "beginnen. Fortfahren?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD Karte" @@ -1859,12 +1859,12 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Auswahl" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1875,23 +1875,23 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Wähle filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Wähle Sprache" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vorheiztemperatur auswählen, die Ihrem Material entspricht." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Wählen Sie die Temperatur, die zu Ihrem Material passt." @@ -1902,28 +1902,28 @@ msgid "Selecting fil. slot" msgstr "Wähle Filament Platz" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Selbsttest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Selbsttest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selbsttest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Selbsttest Fehler!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Selbsttest Error" @@ -1933,30 +1933,30 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest wird gestartet, um Startposition zu kalibrieren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Sensor Info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensor überprüft, entladen Sie jetzt das Filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Temp. einstellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Einstellungen" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Sehr schräg" @@ -1967,7 +1967,7 @@ msgid "Sheet" msgstr "Stahlblech" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1980,18 +1980,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Endschalter Status" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Leise" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Leicht schräg" @@ -2009,8 +2009,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sort." @@ -2021,20 +2021,20 @@ msgid "Sorting files" msgstr "Sortiere Dateien" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Ton" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Geschwindigkeit" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Dreht sich" @@ -2045,19 +2045,19 @@ msgstr "" "Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistiken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Leise" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Stahlbleche" @@ -2067,24 +2067,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Druck abbrechen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Ausgetauscht" @@ -2124,7 +2124,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNTERSPANN.FEHL." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2138,17 +2138,17 @@ msgid "Thermal model not calibrated yet." msgstr "Thermomodell noch unkalibriert." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Teste filament" @@ -2167,7 +2167,7 @@ msgid "" msgstr "Selektor erreicht Startpos. nicht. Prüf, ob etwas blockiert." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2187,39 +2187,39 @@ msgstr "" " Schritte." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Zeit" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Gesamt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Gesamte Fehler" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Gesamtes Filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Gesamte Druckzeit" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Feineinstellung" @@ -2234,15 +2234,15 @@ msgid "Unload" msgstr "Entla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Fil. entladen" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Filament auswerfen" @@ -2259,14 +2259,14 @@ msgid "Unloading to pulley" msgstr "Entlade zur Riemens." #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "" "Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals " "versuchen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Spannungen" @@ -2277,7 +2277,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WARNUNG TMC ZU HEISS" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2295,18 +2295,18 @@ msgid "Wait for user..." msgstr "Warte auf Benutzer.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekühlt ist" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekühlt sind" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Warnen" @@ -2331,141 +2331,141 @@ msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Verdrahtungsfehler" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Assistent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-Korrektur:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schräglauf wird automatisch korrigiert." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "XYZ-Kalibrierung fehlgeschlagen. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen - mehr im Handbuch." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung fehlgeschlagen. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glückwunsch!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y Entfernung vom Min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-Korrektur:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu " "starten." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-Korrektur:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-Test Nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "und Knopf drücken" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "um Filament laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "um Filament entladen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "unbekannt" @@ -2475,19 +2475,19 @@ msgid "unknown state" msgstr "Status unbekannt" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Aktualisiere" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU Netzfehler" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Aus MMU auswerf." @@ -2525,8 +2525,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU-UNTERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Materialwechsel" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index d4d4d0470..579d2744d 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s nivel esperado" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Cancelar" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Ajustar-Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Todo bien" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Terminado. Felices impresiones!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Siemp." #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Llevar al origen" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Encendido" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Carga auto. filam." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Evitar morder" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Eje" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Longitud del eje" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Atras" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Base" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Base preparada" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -169,18 +169,18 @@ msgstr "" "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Base/Calentador" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Estado de correa" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test cinturon" @@ -191,13 +191,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. Re- anudar la impresion?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Brillo" @@ -207,17 +207,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERROR COMUNICACION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Calibrar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,12 +227,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +241,17 @@ msgstr "" "superiores. Despues haz clic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Calibrar pos.inicial" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Calibracion" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Calibracion OK" @@ -269,120 +269,120 @@ msgstr "" "No se puede realizar la acción, filamento ya cargado. Descárgalo primero." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Tarjeta retirada" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Cambiar Tarj. SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Cambiar filamento" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Cambio correcto!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Cambio correcto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Control sensor X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Control sensor Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Control sensor Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Control base cal." #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Control endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Verif. archivo" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Control fusor" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Comprobando sensores" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Comprobaciones" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Borrar error TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Color no homogeneo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Desde la comunidad" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Enfriar" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Choque" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Det. choque" @@ -392,7 +392,7 @@ msgid "Crash detected." msgstr "Choque detectado." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +403,24 @@ msgstr "" "Modo normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Cortar filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Cuchillo" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Fecha:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Oscuro" @@ -430,7 +430,7 @@ msgid "Disable" msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Apagar motores" @@ -453,7 +453,7 @@ msgstr "" "fijada. Siga el manual, capitulo Primeros Pasos." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -466,7 +466,7 @@ msgid "Done" msgstr "Listo" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Corregir-E:" @@ -495,13 +495,13 @@ msgid "ERR Wait for User" msgstr "ERR Espera usuario" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Expulsar de MMU" @@ -513,17 +513,17 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Final de carrera" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Endstop no alcanzado" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Finales de carrera" @@ -535,30 +535,30 @@ msgid "Engaging idler" msgstr "Enganchando tensor" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruir" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Info. del extrusor" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "Autocarg.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Det. atasco f" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "Fin fil." @@ -596,8 +596,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ATASCO FIL." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS accion" @@ -622,36 +622,36 @@ msgid "FW RUNTIME ERROR" msgstr "ERROR EJECUCION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Estadistica Fallos" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Total Fallos MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falsa activacion" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Velocidad Vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventiladores" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Comprob.vent" @@ -680,41 +680,41 @@ msgid "Feeding to nozzle" msgstr "Aliment. a la boq." #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. acabado" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Sensor Fil." #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filamento" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. no introducido" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Sensor de fil." @@ -747,42 +747,42 @@ msgstr "" " ok." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Filamento usado" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. Continuar de todos modos?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Term. movimientos" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Cal. primera cap." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Primero, hare el Selftest para comprobar los problemas de montaje mas " "comunes." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flujo" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,18 +791,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Vent. frontal?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Frontal [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Vents. front/izqui" @@ -851,13 +851,13 @@ msgstr "" "cancelada." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "Configuracion HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" @@ -879,7 +879,7 @@ msgid "Heating done." msgstr "Calentando acabado." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -890,7 +890,7 @@ msgstr "" "listo para imprimir." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -899,9 +899,9 @@ msgstr "" " configuracion?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Rend.pleno" @@ -912,23 +912,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Fusor a 280C! Boquilla cambiado y ajust. a la medida?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Vent. d. fusor:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Hare la calibracion XYZ. Puede tardar hasta 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." @@ -953,7 +953,7 @@ msgid "INVALID TOOL" msgstr "HERR. INVALIDA" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -967,22 +967,22 @@ msgid "Improving bed calibration point" msgstr "Mejorando punto calibracion base" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Monitorizar" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. Tarjeta SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Introducir filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +998,14 @@ msgstr "" "firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Esta c. la lamina sobre la base?" @@ -1015,98 +1015,98 @@ msgid "Iteration" msgstr "Iteracion" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Ultima impresion" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Ultimos imp. fallos" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Izquierda" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Izquierda [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Valor brill." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Valor oscuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Correc. Linealidad" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Micropaso Eje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Intr. todos fil." #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Cargar a boquilla" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Prueba de carga" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Cambiando color" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Introduciendo filam." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Polea suelta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Alto" @@ -1121,8 +1121,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Error interno del firmware MMU, reinicia el MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "Modo MMU" @@ -1132,7 +1132,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NO RESPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Reintento: Restaurando temperatura..." @@ -1143,14 +1143,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST FALLO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Fallos MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Carga MMU falla" @@ -1165,28 +1165,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "La MMU no responde. Revise los cables y conectores." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU conectado" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Comp. imanes" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Menu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Desv. medida" @@ -1197,36 +1197,36 @@ msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Malla" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Nivela. Malla Base" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Modo" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Cambio de modo progresando ..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modelo" @@ -1247,28 +1247,28 @@ msgid "More details online." msgstr "Mas detalles online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Mover X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Mover Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Mover Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Mover ejes" @@ -1280,10 +1280,10 @@ msgstr "Moviendo selector" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/D" @@ -1293,14 +1293,14 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "No hay tarjeta SD" @@ -1310,33 +1310,33 @@ msgid "No move." msgstr "Sin movimiento" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Ninguno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "No hay conexion" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Ventilador no gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1344,33 +1344,33 @@ msgstr "" " la base." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Boquilla" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Cambio de boquilla" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "D boquilla" @@ -1382,15 +1382,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Ina" @@ -1403,19 +1403,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Act" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Una vez" @@ -1425,40 +1425,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERROR TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "Cal. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "Cal. PID terminada" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "Calibracion PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Calentando PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Fallo de la calibracion de PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1478,13 +1478,13 @@ msgid "Parking selector" msgstr "Aparcando selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pausar impresion" @@ -1504,7 +1504,7 @@ msgstr "" "los primeros 4 puntos. Si la boquilla coge el papel, apague inmediatamente." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1513,17 +1513,17 @@ msgstr "" "continua con el Asistente" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Comprueba la conexion del IR sensor y filamento esta descargado." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Controla:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, y luego presiona el dial." @@ -1533,14 +1533,14 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Clic cuando acabes." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Coloca el filamento en el extrusor, luego presiona el dial para cargarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,7 +1549,7 @@ msgstr "" "cargarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Carga primero el filamento." @@ -1560,7 +1560,7 @@ msgstr "Abre el tensor y retira el filamento manualmente." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Coloca la lam. de acero en la base calefactable." @@ -1571,12 +1571,12 @@ msgid "Please press the knob to unload filament" msgstr "Pulsa el dial para descargar el filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Retira el filamento de inmediato" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Retira los soportes de envio primero." @@ -1592,7 +1592,7 @@ msgid "Please run XYZ calibration first." msgstr "Realiza la calibracion XYZ primero." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descarga el filamento, luego repite esta accion." @@ -1604,49 +1604,49 @@ msgstr "Actualiza por favor." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Por favor espere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Fallos energia" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Precalentar" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Precalent. laminar" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Precalent. expulsar" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Precalent. cargar" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Precalent. descargar" @@ -1657,7 +1657,7 @@ msgid "Preparing blade" msgstr "Preparando cuchilla" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Pulsa el dial" @@ -1667,33 +1667,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Impresion cancelada" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Vent.fusor:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Menu tarjeta SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Impresion en pausa" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Tiempo de imp." #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Dir. IP impresora:" @@ -1739,12 +1739,12 @@ msgid "QUEUE FULL" msgstr "COLA LLENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "Puerto RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Trasera [µm]" @@ -1760,7 +1760,7 @@ msgstr "" "Retira el fil. viejo y presione el dial para comenzar a cargar el nuevo." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Renombrar" @@ -1774,24 +1774,24 @@ msgstr "" "para si el índice de herramienta está fuera de rango (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Reanudar impres." #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Continuan. impresion" @@ -1813,17 +1813,17 @@ msgid "Returning selector" msgstr "Selector volviendo" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Derecha" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Derecha [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1832,8 +1832,8 @@ msgstr "" "comenzara de nuevo. Continuar?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "Tarj. SD" @@ -1859,12 +1859,12 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Seleccionar" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1875,25 +1875,25 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Selecciona filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Cambiar el idioma" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu " "material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." @@ -1904,28 +1904,28 @@ msgid "Selecting fil. slot" msgstr "Eligiendo hueco fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Self test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Iniciar Selftest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Error Selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Fallo Selftest" @@ -1937,30 +1937,30 @@ msgstr "" "posicion inicial sin sensores." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info sensor" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retira el filamento ahora." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Establecer temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Configuracion" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Desv. severa" @@ -1971,7 +1971,7 @@ msgid "Sheet" msgstr "Lamina" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1984,18 +1984,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Mostrar endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Acallar" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Desv. ligera" @@ -2014,8 +2014,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Ordenar" @@ -2026,20 +2026,20 @@ msgid "Sorting files" msgstr "Ordenando archivos" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Sonido" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Velocidad" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Ventilador girando" @@ -2050,19 +2050,19 @@ msgstr "" "Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Estadisticas" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Sigilo" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Lamina de acero" @@ -2072,24 +2072,24 @@ msgid "Stop" msgstr "Parar" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Detener impresion" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Estrict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Soporte" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Intercambiado" @@ -2129,7 +2129,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERROR SBRVOLTAJE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2143,17 +2143,17 @@ msgid "Thermal model not calibrated yet." msgstr "Modelo térmico todavia sin cal." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturas" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Probando filamento" @@ -2174,7 +2174,7 @@ msgstr "" "su movimiento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2194,39 +2194,39 @@ msgstr "" "Primeros pasos." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Fecha" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Expirar" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Fallos totales" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filamento total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Tiempo total imp." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Ajustar" @@ -2241,15 +2241,15 @@ msgid "Unload" msgstr "Desc." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Descargar fil." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Descargando fil." @@ -2266,12 +2266,12 @@ msgid "Unloading to pulley" msgstr "Descarga hasta polea" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retira el filamento e intenta nuevamente." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Voltajes" @@ -2282,7 +2282,7 @@ msgid "WARNING TMC TOO HOT" msgstr "AVISO TMC DEM. CALOR" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2300,18 +2300,18 @@ msgid "Wait for user..." msgstr "Esperando ordenes..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Aviso" @@ -2337,136 +2337,136 @@ msgid "Was filament unload successful?" msgstr "Se descargo con exito el filamento?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Error de conexion" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Asistente" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Corregir-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La desviacion se corregira automaticamente." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibracion XYZ correcta. Los ejes X/Y estan ligeramente desviados. Buen " "trabajo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Dist. en Y desde min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Corregir-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Asistente" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Corregir-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] punto offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "y presione el dial" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "para cargar el fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "para descargar fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "desconocido" @@ -2476,13 +2476,13 @@ msgid "unknown state" msgstr "estado desconocido" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Actualizar" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Fallo red MMU" @@ -2520,8 +2520,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU BAJO VOLTAJE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Cambios materiales" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 987e1721e..d09346508 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 ou +recent" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "niveau %s attendu" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Annuler" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Ajuster Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Tout est correct" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne impression!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Tjrs" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Ambiant" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Mise a 0 des axes" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Puiss.auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autocharge du fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Eviter broiement" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Axe" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Longueur de l'axe" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Retour" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Plateau" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Plateau termine" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Reglage plateau" @@ -170,18 +170,18 @@ msgstr "" "attente d'un reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Plateau/Chauffage" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Statut courroie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test de courroie" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impres.?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Luminosite" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERREUR COMMUNICATION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Calibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Calibration Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" " Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Calib. mise a 0" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Calibration" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Calibration terminee" @@ -271,120 +271,120 @@ msgstr "" "d'abord." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Carte retiree" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Changez carte SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Changer filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Changement reussi!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Change correctement?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Verific. axe X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Verific. axe Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Verific. axe Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Verif. plateau" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Verific. butees" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Verific. fichier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Verif. du hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Verif. des capteurs" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Verifications" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Effacer l'error TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Couleur incorrecte" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Fait de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Refroidissement" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Copier la langue choisie?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Detect.crash" @@ -394,7 +394,7 @@ msgid "Crash detected." msgstr "Crash detecte." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +406,24 @@ msgstr "" "mode Normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Coupe filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Coupeur" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Date:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Sombre" @@ -433,7 +433,7 @@ msgid "Disable" msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -456,7 +456,7 @@ msgstr "" " le manuel, chap. Premiers pas." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +470,7 @@ msgid "Done" msgstr "Fait" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Correct-E:" @@ -499,13 +499,13 @@ msgid "ERR Wait for User" msgstr "ERR Att. Utilisateur" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "ERREUR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Éjecter du MMU" @@ -517,17 +517,17 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Butee" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Butee non atteinte" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Butees" @@ -539,30 +539,30 @@ msgid "Engaging idler" msgstr "Engagem.t de l'idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extrudeur" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Infos extrudeur" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autocharg." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Detect bour F" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "Fin de F." @@ -601,8 +601,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOQUE" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "Action FS" @@ -627,36 +627,36 @@ msgid "FW RUNTIME ERROR" msgstr "ERREUR EXECUTION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Stat. d'echec" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Faux declenchement" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Vitesse vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test du ventilateur" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Verif vent." @@ -685,41 +685,41 @@ msgid "Feeding to nozzle" msgstr "Chargement vers buse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fins filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Capteur Fil." #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Filament non charge" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Capteur Fil." @@ -751,42 +751,42 @@ msgstr "" "Verifiez le tube PTFE. Verifiez que le capteur fonctionne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Filament utilise" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Mouvement final" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Cal. 1ere couche" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Je vais lancer le Auto-test pour verifier les problemes d'assemblage les " "plus communs." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flux" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -795,18 +795,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Ventilo impr avant?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Avant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Ventilos avt/gauche" @@ -855,13 +855,13 @@ msgstr "" "annulee." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "Config HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" @@ -883,7 +883,7 @@ msgid "Heating done." msgstr "Chauffe terminee." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -894,7 +894,7 @@ msgstr "" "Apres cela, tout sera pret pour imprimer." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -903,9 +903,9 @@ msgstr "" " guide dans le processus d'installation?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Haut.puiss" @@ -916,25 +916,25 @@ msgid "Homing" msgstr "Mise a zero" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "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:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" "Je vais maintenant lancer la calibration XYZ. Cela peut prendre jusqu'à 24 " "min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." @@ -959,7 +959,7 @@ msgid "INVALID TOOL" msgstr "OUTIL INVALIDE" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -973,22 +973,22 @@ msgid "Improving bed calibration point" msgstr "Amelioration du point de calibration du plateau" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Ecran d'info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. carte SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Inserez le filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1005,14 +1005,14 @@ msgstr "" " le FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Est la plaque sur le plateau?" @@ -1022,98 +1022,98 @@ msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Derniere impres." #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Echecs derniere imp." #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Gauche" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Ventilo gauche?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Gauche [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Niveau brill" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Niv. sombre" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Correction lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Ajuster Z en dir." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Tout Charger" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Charger filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Charger la buse" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Essai de charge." #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Charg. de la couleur" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Chargement du fil." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Poulie lache" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Fort" @@ -1128,8 +1128,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Erreur interne du FW du MMU, reinitialiser le MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "Mode MMU" @@ -1139,7 +1139,7 @@ msgid "MMU NOT RESPONDING" msgstr "LE MMU NE REPOND PAS" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "Nouvelle tentative MMU: Restauration de la temperature..." @@ -1150,14 +1150,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTO-TEST ECHEC" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Echecs MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Def. charg. MMU" @@ -1173,28 +1173,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne repond pas. Verifiez le cablage et les connecteurs." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU connecte" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Compens. aim." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Menu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Var. mesuree" @@ -1205,36 +1205,36 @@ msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Changement de mode en cours..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modele" @@ -1255,28 +1255,28 @@ msgid "More details online." msgstr "Plus de details en ligne." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Moteur" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Deplacer X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Deplacer Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Deplacer Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Deplacer l'axe" @@ -1288,10 +1288,10 @@ msgstr "Deplacement select." #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "I/D" @@ -1301,14 +1301,14 @@ msgid "New firmware version available:" msgstr "Nouvelle version de FW disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Non" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Pas de carte SD" @@ -1318,33 +1318,33 @@ msgid "No move." msgstr "Pas de mouvement." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Aucun" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Non connecte" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Ne tourne pas" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1352,33 +1352,33 @@ msgstr "" "plateau." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Buse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Changement de buse" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Diam. buse" @@ -1390,15 +1390,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Off" @@ -1410,19 +1410,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "1 fois" @@ -1432,40 +1432,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSE ERREUR THERM." #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "Calib. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "Calib. PID terminee" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "Calibration PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Echec de la calibration en PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1485,13 +1485,13 @@ msgid "Parking selector" msgstr "Parquage selecteur" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pause de l'impr." @@ -1511,7 +1511,7 @@ msgstr "" "premiers points. Si la buse accroche le papier, eteignez vite l'imprimante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1520,17 +1520,17 @@ msgstr "" "l'assistant en redemarrant l'imprimante." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Verifiez:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez la plaque en acier et appuyez sur le bouton." @@ -1540,7 +1540,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1548,7 +1548,7 @@ msgstr "" "pour le charger." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1557,7 +1557,7 @@ msgstr "" "pour le charger." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." @@ -1568,7 +1568,7 @@ msgstr "Ouvrez l'idler et retirez le filament manuellement." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau." @@ -1579,12 +1579,12 @@ msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." @@ -1600,7 +1600,7 @@ msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." @@ -1612,49 +1612,49 @@ msgstr "Mettez a jour le FW." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Merci de patienter" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Coup.de courant" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Prechauffage" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Chauffe pour couper" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Chauf. pour remonter" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Chauffe pour charger" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Chauf.pour decharger" @@ -1665,7 +1665,7 @@ msgid "Preparing blade" msgstr "Preparation lame" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "App. sur sur bouton" @@ -1675,33 +1675,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Impression annulee" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Vent. impr:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Impr. depuis la SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Impression en pause" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Temps d'impression" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Adr.IP imprimante:" @@ -1747,12 +1747,12 @@ msgid "QUEUE FULL" msgstr "FILE PLEINE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Arriere [µm]" @@ -1768,7 +1768,7 @@ msgstr "" "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Renommer" @@ -1782,24 +1782,24 @@ msgstr "" " dans le G-code un index d'outil hors plage (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reinitialiser" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Reprise impression" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Reprise de l'impr." @@ -1821,17 +1821,17 @@ msgid "Returning selector" msgstr "Retournement select." #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Droite" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Droite [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1840,8 +1840,8 @@ msgstr "" "commencera du debut. Continuer?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "Carte SD" @@ -1867,12 +1867,12 @@ msgid "Searching bed calibration point" msgstr "Recherche point calibration du plateau" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Selectionner" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1883,25 +1883,25 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Choix du filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Choisir langue" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selectionnez la temperature de prechauffage de la buse qui correspond a " "votre materiau." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." @@ -1912,28 +1912,28 @@ msgid "Selecting fil. slot" msgstr "Sélection du fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Auto-test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Debut auto-test" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Auto-test" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Erreur auto-test!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Echec de l'auto-test" @@ -1944,30 +1944,30 @@ msgstr "" "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info capteur" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Regler temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Reglages" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Deviat.sev." @@ -1978,7 +1978,7 @@ msgid "Sheet" msgstr "Plaque" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1991,18 +1991,18 @@ msgstr "" "%cReinitialiser" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Afficher butees" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Furtif" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Deviat.leg." @@ -2020,8 +2020,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Tri" @@ -2032,20 +2032,20 @@ msgid "Sorting files" msgstr "Tri des fichiers" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Son" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Vitesse" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Tourne" @@ -2056,19 +2056,19 @@ msgstr "" "Une temperature ambiante stable de 21-26C et un support stable sont requis." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistiques" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Furtif" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Plaques en acier" @@ -2078,24 +2078,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Arreter impression" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Stricte" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Echange" @@ -2135,7 +2135,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR SOUS TENSION TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2149,17 +2149,17 @@ msgid "Thermal model not calibrated yet." msgstr "Modele de thermique non calibre." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperature" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperatures" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Test du filament" @@ -2180,7 +2180,7 @@ msgstr "" "quoi que ce soit qui bloque son mouvement." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2199,39 +2199,39 @@ msgstr "" "Premiers pas - Processus de calibration." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Heure" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Delai ecoule" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Total des echecs" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filament total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Temps total impr." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Regler" @@ -2246,15 +2246,15 @@ msgid "Unload" msgstr "Dech." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Decharger fil." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Dechargement fil." @@ -2271,12 +2271,12 @@ msgid "Unloading to pulley" msgstr "Dechar.t vers poulie" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Tensions" @@ -2287,7 +2287,7 @@ msgid "WARNING TMC TOO HOT" msgstr "ATT TMC TROP CHAUD" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2305,18 +2305,18 @@ msgid "Wait for user..." msgstr "Attente utilisateur." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Avert" @@ -2341,53 +2341,53 @@ msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Erreur de cablage" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Assistant" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Correct-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "Init XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Details calib. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibration XYZ OK. L'ecart sera corrige automatiquement." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon " "boulot!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Calibration XYZ compromise. Les points de calibration en avant ne sont pas " "atteignables." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" @@ -2395,93 +2395,93 @@ msgstr "" "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete " "trouve." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Echec calibration XYZ. Les points de calibration en avant ne sont pas " "atteignables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Echec calibration XYZ. Le point de calibration avant droit n'est pas " "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Distance Y du min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Correct-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Oui" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Correct-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Mesurer x-fois" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "Offset point [0;0]" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "et appuyez sur le bouton" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "pour charger le fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "pour decharger fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "inconnu" @@ -2491,13 +2491,13 @@ msgid "unknown state" msgstr "Etat inconnu" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Rafraichir" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Def. alim. MMU" @@ -2535,8 +2535,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU SOUS-TENSION VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Changes matériels" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 109442860..6953b096d 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 ili noviji" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s level ocekivan" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Otkazati" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Podesavanje Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Sve je u redu" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Sve je gotovo. Sretno printanje!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Uvijek" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Ambijent" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Jesu lijevi i desni Z~nosaci podignuti?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Pomoc" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Pocetna tocka" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Auto napaj" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autopunj filamenta" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "Auto punjenje fil. je aktivno, pritisnite gumb i umetnite fil.." @@ -114,27 +114,27 @@ msgid "Avoiding grind" msgstr "Sprecavanje mljevenj" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Duljina osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Natrag" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Podloga" @@ -151,7 +151,7 @@ msgid "Bed done" msgstr "Podloga zagrijana" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Podloga ispravna" @@ -169,18 +169,18 @@ msgstr "" "mlaznici? Ceka se resetiranje." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Grijac/Podloga" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Status remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Testiranje remena" @@ -191,13 +191,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Doslo je do gasenja. Oporaviti print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Svijet" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Svjetlina" @@ -207,17 +207,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOM. GRESKA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibrirajte XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrirajte Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,12 +227,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibriracija Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +241,17 @@ msgstr "" "Kliknite kada je zavrseno." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibracija nultocke" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibriranje" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibracija gotova" @@ -269,120 +269,120 @@ msgstr "" "Nije moguce izvrsiti radnju, filament je već napunjen. Prvo ga isprazni." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Kartica je uklonjena" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Promjeni SD karti." #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Promijeni filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Promijena uspjesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Ispravno izmjenjeno?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Provjera X osi" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Provjera Y osi" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Provjera Z osi" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Provjera podloge" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Provjera granicnika" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Provjera datoteke" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Provjera hotenda" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Provjera senzora" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Provjere" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Obriši TM pogrešku" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Boja nije ispravna" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Napravilo zajedno" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Nast." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Ohladi" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kopirati odabrani jezik?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Udar" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Udar detekti." @@ -392,7 +392,7 @@ msgid "Crash detected." msgstr "Udar otkriven." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -400,24 +400,24 @@ msgid "" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Odrezite fil." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Rezac" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Tamno" @@ -427,7 +427,7 @@ msgid "Disable" msgstr "Onemogu." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Onemoguci stepere" @@ -451,7 +451,7 @@ msgstr "" "prvog sloja." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -465,7 +465,7 @@ msgid "Done" msgstr "Gotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-ispravan:" @@ -494,13 +494,13 @@ msgid "ERR Wait for User" msgstr "ERR Cekam korisnika" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "POGRESKA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Izbaci iz MMU" @@ -512,17 +512,17 @@ msgid "Ejecting filament" msgstr "Izbacivanje fil." #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Granicnik" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Granicnik nije aktiv" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Granicnici" @@ -534,30 +534,30 @@ msgid "Engaging idler" msgstr "Angaziranje klizaca" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Info o ekstruderu" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. auto.punj" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F. zastopan" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. isteko" @@ -595,8 +595,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. ZAPEO" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS Akcija" @@ -621,36 +621,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW GRESKA IZVRSENJA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Neuspjesna stat" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Neuspjes. MMU stat" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Lazno aktiviranje" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Brzina vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Provjera vent" @@ -679,41 +679,41 @@ msgid "Feeding to nozzle" msgstr "Dovod do mlaznice" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Bez filmaneta" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Ekstrudiranje fil.s sa ispravnom bojom?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. nije napunjen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Senzor filamenta" @@ -745,42 +745,42 @@ msgstr "" " li je nešto zapelo u PTFE cijevi. Ocitava li senzor ispravno." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Iskoristeni fil." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Datoteka je nepotpuna. Svejedno nastaviti?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Zavrsni pokreti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Prvi sloj kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Prvo cu pokrenuti samotestiranje kako bih provjerio najcesce probleme sa " "montazom." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Protok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -789,18 +789,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Prednji print vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Prednj str[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Prednji/lijevi vent" @@ -849,13 +849,13 @@ msgstr "" "otkazan." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW podesavanje" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Grijac/Termostat" @@ -877,7 +877,7 @@ msgid "Heating done." msgstr "Grijanje obavljeno." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +888,7 @@ msgstr "" "printanje." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +897,9 @@ msgstr "" "postupak postavljanja?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Visoka sna" @@ -910,24 +910,24 @@ msgid "Homing" msgstr "Navodjenje" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" "Zagrijati na 280C! Mlaznica promijenjena i stegnuta prema specifikacijama?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend vent:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Sada cu pokrenuti z kalibraciju." @@ -952,7 +952,7 @@ msgid "INVALID TOOL" msgstr "NEVALJAN ALAT" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -966,22 +966,22 @@ msgid "Improving bed calibration point" msgstr "Poboljšanje točke kalibracije podloge" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Info zaslon" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Obrada SD kartice" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Umetnite filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +997,14 @@ msgstr "" "firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Je li filament napunjen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Je li celicna ploca na grijanoj podlozi?" @@ -1014,98 +1014,98 @@ msgid "Iteration" msgstr "Ponavljanje" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Zadnji print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Zadnji neusp. print" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Lijevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Lijevi hotend vent?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Lijeva str[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Razina svjet" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Razina zatam" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Lin. ispravak" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Live podesavanje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Puni sve" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Punjenje u mlazn" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Punjenje test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Ucitavanje boje" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Punjenje filamenta" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Labava remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Glasno" @@ -1120,8 +1120,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interna pogreska firmware MMU-a, resetirajte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU Mod" @@ -1131,7 +1131,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NE ODGOVARA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ponovni pokusaj: Vracanje temperature..." @@ -1142,14 +1142,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST N USPIO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU ne uspijeva" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Neusp. MMU punj" @@ -1164,28 +1164,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne reagira. Provjerite ozicenje i konektore." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU spojen" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnet. komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Nazad" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Mjereni nagib" @@ -1196,36 +1196,36 @@ msgid "Measuring reference height of calibration point" msgstr "Mjerenje referentne visine kalibracijske tocke" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mreza" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Izrav. mrez. podl" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Promjena moda u tijeku..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1246,28 +1246,28 @@ msgid "More details online." msgstr "Vise detalja online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Pomaknite X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Pomaknite Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Pomaknite Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Pomaknite os" @@ -1279,10 +1279,10 @@ msgstr "Pomicanje odabiraca" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1292,14 +1292,14 @@ msgid "New firmware version available:" msgstr "Dostupna nova verzija firmwera:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Nema SD kartice" @@ -1309,33 +1309,33 @@ msgid "No move." msgstr "Bez pomaka." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Nema" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nije povezano" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Ne okrece se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1343,33 +1343,33 @@ msgstr "" "podloge." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Sada cu zagrijati mlaznicu za PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Sada uklonite probni print sa celicne ploce." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Mlaznica" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Promjena mlaznice" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Mlaznica." @@ -1381,15 +1381,15 @@ msgstr "Ok" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Off" @@ -1400,19 +1400,19 @@ msgstr "Pronadene stare postavke. Postavit ce se zadani PID, Esteps itd." #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Jednom" @@ -1422,40 +1422,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUZIRAN TERMAL EROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kal. zavrsena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibracija" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA se Zagrijava" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Kalibracija PINDA nije uspjela" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1475,13 @@ msgid "Parking selector" msgstr "Selektor parkiranja" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pauzirajte print" @@ -1501,7 +1501,7 @@ msgstr "" "mlaznica uhvati papir, odmah iskljucite printer." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,17 +1510,17 @@ msgstr "" "ponovnim pokretanjem printera." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Provjerite IR prikljucak senzora, izvadite filament ako postoji." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Molimo provjerite:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Ocistite grijacu podlogu, a zatim pritisnite gumb." @@ -1530,13 +1530,13 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Molimo ocistite mlaznicu radi kalibracije. Kliknite kada ste gotovi." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Umetnite filament u ekstruder, a zatim pritisnite gumb za punjenje." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1544,7 +1544,7 @@ msgstr "" "Umetnite filament u prvu cijev MMU-a, a zatim pritisnite gumb za punjenje." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Molimo prvo ubacite filament." @@ -1555,7 +1555,7 @@ msgstr "Molimo otvorite klizac i rucno uklonite filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Stavite celicnu plocu na grijacu podlogu." @@ -1566,12 +1566,12 @@ msgid "Please press the knob to unload filament" msgstr "Pritisnite gumb za praznjenje filamenta" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Molimo odmah izvucite filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Najprije uklonite prijevozne osloce." @@ -1587,7 +1587,7 @@ msgid "Please run XYZ calibration first." msgstr "Prvo pokrenite XYZ kalibraciju." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Prvo izvadite filament, a zatim ponovite ovu radnju." @@ -1599,49 +1599,49 @@ msgstr "Molimo nadogradite." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Molimo pricekajte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Prekidi struje" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Predgrijavanje" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Predgr. mlaznicu!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Predgrijavanje mlaznice. Molim vas pricekajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Predgr. za rezanje" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Predgr. za izbaci." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Predgr. za punjenje" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Predgr. za praznj." @@ -1652,7 +1652,7 @@ msgid "Preparing blade" msgstr "Priprema ostrice" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Pritisnite gumb" @@ -1662,33 +1662,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Pritisnite gumb za predgrijavanje mlaznice i nastavite." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Print je prekinut" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Vent printa:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Printaj sa SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Print pauziran" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Vrijeme printanja" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Printer IP Adr:" @@ -1734,12 +1734,12 @@ msgid "QUEUE FULL" msgstr "RED PUN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi utor" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Zad. str.[µm]" @@ -1754,7 +1754,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Preimenuj" @@ -1768,24 +1768,24 @@ msgstr "" "za indeks alata izvan raspona (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Resetiraj" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Nastavite print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Nastavak printa" @@ -1807,17 +1807,17 @@ msgid "Returning selector" msgstr "Povratak izbornika" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Tocno" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Desna str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1826,8 +1826,8 @@ msgstr "" "ispocetka. Nastavite?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD karti" @@ -1853,12 +1853,12 @@ msgid "Searching bed calibration point" msgstr "Trazenje tocke kalibracije podloge" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Odaberi" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1869,25 +1869,25 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Odaberi filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Izaberi jezik" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Odaberite temperaturu predgrijavanja mlaznice koja odgovara vasem " "materijalu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Odaberite temperaturu koja odgovara vasem materijalu." @@ -1898,28 +1898,28 @@ msgid "Selecting fil. slot" msgstr "Odabir fil. utora" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Samotestiranje OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Pocetak selftesta" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Selftest error!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Selftest nije uspio" @@ -1931,30 +1931,30 @@ msgstr "" "senzora." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info senzora" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Senzor je provjeren, odmah uklonite filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Postavi temperaturu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Postavke" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Veliki nagib" @@ -1965,7 +1965,7 @@ msgid "Sheet" msgstr "Ploca" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1978,18 +1978,18 @@ msgstr "" "%cResetiraj" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Pokazi granicnike" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Tih" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Lagani nagib" @@ -2008,8 +2008,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Naisao je neki problem, nametnuto Z-niveliranje..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Vrsta" @@ -2020,20 +2020,20 @@ msgid "Sorting files" msgstr "Sortiranje datoteka" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Brzina" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Okrece se" @@ -2045,19 +2045,19 @@ msgstr "" "postolje." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Tiho" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Celicna ploca" @@ -2067,24 +2067,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Zaustavi print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Strogo" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Podrska" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Zamjenjeno" @@ -2124,7 +2124,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC NISKA VOLTAZA" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2138,17 +2138,17 @@ msgid "Thermal model not calibrated yet." msgstr "Toplinski model još nije kalibriran." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Testiram filament" @@ -2169,7 +2169,7 @@ msgstr "" "sprjecava njegovo kretanje." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2188,39 +2188,39 @@ msgstr "" "poglavlje Prvi koraci, odjeljak Tijek kalibracije." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Vrijeme" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Pauza" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Ukupno" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Totalne pogreske" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Totalno filamenta" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Vrijeme printanja" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Ugodi" @@ -2235,15 +2235,15 @@ msgid "Unload" msgstr "Prazni" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Ispraznite fil." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Praznjenje filamenta" @@ -2260,12 +2260,12 @@ msgid "Unloading to pulley" msgstr "PRAZNJ DO REMENICE" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Provjera nije uspjela, uklonite filament i pokusajte ponovno." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Voltaza" @@ -2276,7 +2276,7 @@ msgid "WARNING TMC TOO HOT" msgstr "UPOZORENJE TMC VRUC" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2293,18 +2293,18 @@ msgid "Wait for user..." msgstr "Ceka se korisnik..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Ceka se hladenje PINDA sonde" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Ceka se hladjenje mlaznice i podloge" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Upozore" @@ -2329,138 +2329,138 @@ msgid "Was filament unload successful?" msgstr "Je li praznjenje fil. bilo uspjesno?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Greska u ozicenju" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Carobnjak" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-ispravan:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH validacija" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ detalji kal" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibracija u redu. Iskrivljenost ce se automatski ispraviti." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibracija je u redu. Osi X/Y su malo nagnute. Bravo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "XYZ kalibracija je ugrozena. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ kalibracija je ugrozena. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "XYZ kalibracija nije uspjela. Tocka kalibracije podloga nije pronadena." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "XYZ kalibracija nije uspjela. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracija nije uspjela. Molimo pogledajte prirucnik." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ kalibracija nije uspjela. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracija u redu. Osi X/Y su okomite. Cestitamo!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y distanca od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-ispravan:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Carobnjak uvijek mozete nastaviti iz Kalibracija -> Carobnjak." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-ispravan:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-sonda br." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] razmak tocke" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "i pritisnite gumb" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "da napuni filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "da isprazni filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "nepoznato" @@ -2470,13 +2470,13 @@ msgid "unknown state" msgstr "nepoznato stanje" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Osvjeziti" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Neusp. MMU nap" @@ -2514,8 +2514,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU PODNAPON VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Materijal razmjene" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 9d7412681..a9a99e0c9 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 v. ujabb" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "Vart szint: %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Megsem" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Z allitasa:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Minden rendben" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Keszen vagyunk. Jo nyomtatast!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Abece" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Mindig" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Kornyezet" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "A Z tengely a felso vegponton van?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Seged" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Autom." #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto homeolas" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Auto ero" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Fil. auto.betolt." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autom. betoltes be, nyomd meg a gombot es helyzed be a filamentet." @@ -114,27 +114,27 @@ msgid "Avoiding grind" msgstr "Daralas megelozese" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Tengely" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Tengely hossz" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Vissza" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Asztal" @@ -151,7 +151,7 @@ msgid "Bed done" msgstr "Asztal kesz" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Szint. korrekcio" @@ -169,18 +169,18 @@ msgstr "" " az ujrainditast." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Asztal/Fej futes" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Szij allapot" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Szij teszt" @@ -191,13 +191,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Aramkieses volt, nyomt. folytatasa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Fenyes" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Fenyero" @@ -207,17 +207,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMUNIKACIOS HIBA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "XYZ kalibracio" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Z kalibracio" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,12 +227,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Z kalibralasa" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +241,17 @@ msgstr "" "er, majd nyomd meg ha keszen vagy." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Home poz. kalibralas" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibracio" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibracio kesz" @@ -269,120 +269,120 @@ msgstr "" "A muvelet nem hajthato vegre, a filament mar be van toltve. Vedd ki elobb." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Kartya eltavolitva" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Cserelj SD kartyat" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Filament csere" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Csere sikerult!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Sikerult a csere?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "X tengely ellenorzes" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Y tengely ellenorzes" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Z tengely ellenorzes" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Asztal ellenorzese" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Vegallaskapcs. ellen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Fajl ellenorzese" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Hotend ellenorzese" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Szenz. ellenorzese" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Ellenorzesek" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "TM hiba törlése" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Szin nem jo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Kozossegi" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Folyt" #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Lehutes" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kivalasztott nyelv masolasa?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Utkozes" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Utkozes erz." @@ -392,7 +392,7 @@ msgid "Crash detected." msgstr "Utkozes erzekelve." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +403,24 @@ msgstr "" "kapcsolhato be" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Filament vagasa" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Vago" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Sotet" @@ -430,7 +430,7 @@ msgid "Disable" msgstr "Letilt" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Motorok kikapcsol." @@ -454,7 +454,7 @@ msgstr "" " bekezdest." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +468,7 @@ msgid "Done" msgstr "Kesz" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-korrekcio:" @@ -497,13 +497,13 @@ msgid "ERR Wait for User" msgstr "Felh. varakozas HIBA" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "HIBA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Kiadás az MMUból" @@ -515,17 +515,17 @@ msgid "Ejecting filament" msgstr "Filament kiadasa" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Vegallaskapcsolo" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Vegallask. nem kapcs" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Vegallaskapcsolok" @@ -537,30 +537,30 @@ msgid "Engaging idler" msgstr "Gorgo becsatolasa" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autobetolt" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Dugul. eszlel" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. fogyas" @@ -598,8 +598,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. SZORULT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FSz akcio" @@ -624,36 +624,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW FUTAS HIBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Hiba statisztika" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "MMU hiba stat." #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Hamis kivalto ok" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Vent. sebesseg" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Ventillator teszt" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Vent.proba" @@ -682,41 +682,41 @@ msgid "Feeding to nozzle" msgstr "Fuvokahoz toltes" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. kifutasok" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. szenzor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament es a szine rendben?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. nincs betoltve" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Filament szenzor" @@ -748,42 +748,42 @@ msgstr "" "Ellenorizd a PTFE csovet es a szenzort." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Felhasznalt filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "A fajl vege hianyzik. Folytatod igy is?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Mozdulat befejezese" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Elso reteg kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Elsokent lefuttatom az onellenorzest, hogy megnezzem a leggyakoribb " "osszeszerelesi problemakat." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,18 +792,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Elso targyhuto vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Elulso old[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Elso/bal ventillator" @@ -852,13 +852,13 @@ msgstr "" "Nyomtatas megallitva." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW beallitas" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Futotest/Termisztor" @@ -880,7 +880,7 @@ msgid "Heating done." msgstr "Futes kesz." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,7 +891,7 @@ msgstr "" "nyomtathatsz is." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -900,9 +900,9 @@ msgstr "" " a beallitasi folyamaton?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Magas ero" @@ -913,23 +913,23 @@ msgid "Homing" msgstr "Homeolas" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "A hotend 280C-os! Fuvoka kicserleve es kelloen meghuzva?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Lefuttatom az XYZ kalibraciot. Ez akár 24 percig is eltarthat." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Lefuttatom a Z kalibraciot." @@ -954,7 +954,7 @@ msgid "INVALID TOOL" msgstr "HELYTELEN SZERSZAM" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -968,22 +968,22 @@ msgid "Improving bed calibration point" msgstr "Bed kalibracio pontositasa" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Info kepernyo" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "SD kartya inic." #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Helyezd be a filam." #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +998,14 @@ msgid "" msgstr "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Filament behelyezve?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Rajta van az acellap a targyasztalon?" @@ -1015,98 +1015,98 @@ msgid "Iteration" msgstr "Iteracio" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Utolso nyomtatas" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Utolso nyomt. hibak" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Bal" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Bal hotend vent.?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Bal [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Fenyes szint" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Sotet szint" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Lin. korrekcio" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Z magassag beall." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Ossz.bet" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Filament betolt." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Betolt. fuvokahoz" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Betöltési teszt" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Szin tisztitasa" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Filament betoltese" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Laza szijtarcsa" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Hangos" @@ -1121,8 +1121,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware hiba, kerlek inditsd ujra az MMU-t" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU Mod" @@ -1132,7 +1132,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEM VALASZOL" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ujra: Homerseklet visszaallitasa" @@ -1143,14 +1143,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST HIBA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU hibak" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU bet. hibak" @@ -1166,28 +1166,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU csatlakozott" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnes komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Fomenu" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Meroleg. hiba" @@ -1198,36 +1198,36 @@ msgid "Measuring reference height of calibration point" msgstr "Kalibracios pont magassaganak merese" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Halo" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Asztal szintezes" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Modvaltas folyamatban..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modell" @@ -1248,28 +1248,28 @@ msgid "More details online." msgstr "Tovabbi reszletek a neten." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "X mozgatasa" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Y mozgatasa" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Z mozgatasa" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Tengely mozgatasa" @@ -1281,10 +1281,10 @@ msgstr "Szelektor mozgatasa" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1294,14 +1294,14 @@ msgid "New firmware version available:" msgstr "Uj firmver verzio erheto el:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nem" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Nincs SD kartya" @@ -1311,66 +1311,66 @@ msgid "No move." msgstr "Nincs mozgas." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Nincs" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nincs csatlakoztatva" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Nem forog" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Most beallitjuk a fuvoka hegye es a targyasztal felulete kozotti tavolsagot." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Felfutom a fuvokat PLA-hoz." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Vedd le a tesztnyomatot az acellaprol." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Fuvoka" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Fuvoka csereand" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Fuv. atm." @@ -1382,15 +1382,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Ki" @@ -1402,19 +1402,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Be" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Egyszer" @@ -1424,40 +1424,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "SZUNET HOMERSEK.HIBA" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kalibracio" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kal. kesz" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibracio" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA Futes" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA kalibracio sikertelen." #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1475,13 @@ msgid "Parking selector" msgstr "Szelektor parkolasa" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Szun." #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Nyomtatas szunet" @@ -1501,7 +1501,7 @@ msgstr "" " fuvoka hozzaer a papirlaphoz, azonnal kapcsold ki a nyomtatot." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,17 +1510,17 @@ msgstr "" "folytathatod az uzembe helyezest a nyomtato ujrainditasaval." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Nezd meg az IR szenzor csatlakoz., vedd ki a filam., ha bent van." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Kerlek ellenorizd:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Kerlek, tisztisd le a targyasztalt, majd nyomd meg a gombot." @@ -1532,7 +1532,7 @@ msgstr "" "keszen vagy." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1540,7 +1540,7 @@ msgstr "" "betolteshez." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,7 +1549,7 @@ msgstr "" "a betolteshez." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Kerlek eloszor toltsd be a filamentet." @@ -1561,7 +1561,7 @@ msgstr "" #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Kerlek, helyzed az acellapot a targyasztalra." @@ -1572,12 +1572,12 @@ msgid "Please press the knob to unload filament" msgstr "Kerlek, nyomd meg a gombot a filament kiadasahoz" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Kerlek, huzd ki a filamentet most" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Tavolitsd el a szallitasi segedanyagokat." @@ -1593,7 +1593,7 @@ msgid "Please run XYZ calibration first." msgstr "Kerlek, elobb futtasd le az XYZ kalibraciot." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Kerlek eloszor vedd ki a filamentet, majd probalkozz ujra." @@ -1605,49 +1605,49 @@ msgstr "Kerlek frissits." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Kerlek varj" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Aramkimaradasok" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Elofutes" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Futsd fel a fuvokat!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Fuvoka futese folyamatban. Kerlek, varj." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Melegites vagashoz" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Melegites kiadashoz" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Felfutes betolteshez" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Felfutes kiadashoz" @@ -1658,7 +1658,7 @@ msgid "Preparing blade" msgstr "Penge elokeszites" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Nyomd meg a gombot" @@ -1668,33 +1668,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Nyomd meg a gombot a folytatashoz es a fuvoka felfutesehez." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Nyomt. megszakitva" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Targyhuto:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Nyomtatas SD-rol" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Nyomt. szuneteltetve" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Nyomtatasi ido" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Nyomtato IP cime:" @@ -1738,12 +1738,12 @@ msgid "QUEUE FULL" msgstr "SOR TELE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Hatso old.[µm]" @@ -1758,7 +1758,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Atnevezes" @@ -1772,24 +1772,24 @@ msgstr "" "kivuli ertekeket a G kodban." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Ujrainditas" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "XYZ kal. nullazas" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Nyomt. folytatasa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Nyomtatas folytatasa" @@ -1811,17 +1811,17 @@ msgid "Returning selector" msgstr "Szelektor vissza" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Jobb" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Jobb old.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1830,8 +1830,8 @@ msgstr "" "fog mindent kezdeni. Folytatod?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SDkartya" @@ -1857,12 +1857,12 @@ msgid "Searching bed calibration point" msgstr "Kalibracios pont keresese az asztalon" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Kivalasztas" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1871,25 +1871,25 @@ msgstr "Valassz egy filamentet az elso reteg kalibraciojahoz a menubol." #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Valassz filamentet:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Valassz nyelvet" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Valaszd ki a fuvoka homersekletet, amelyik megfelel az altalad hasznalt " "anyaghoz ajanlott homersekletnek." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Valassz homersekletet, ami megfelel a filamenthez." @@ -1900,28 +1900,28 @@ msgid "Selecting fil. slot" msgstr "Fil.poz.kivalasztasa" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Ondiagnosztika OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Ondiagnosztika indul" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Ondiagnosztika" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Ondiagnosztika hiba!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Ondiag. sikertelen" @@ -1932,30 +1932,30 @@ msgstr "" "A pontos szenzor nelkuli homing erdekeben lefuttatom az ondiagnosztikat." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Szenzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Szenzor OK, vedd ki a filamentet most." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Homerseklet beall.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Beallitasok" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "NagyMerol.hiba" @@ -1966,7 +1966,7 @@ msgid "Sheet" msgstr "Acellap" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,18 +1979,18 @@ msgstr "" "%cUjrainditas" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Vegallaskapcsolok" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Halk" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Kis merol.hiba" @@ -2009,8 +2009,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Hiba tortent, Z szintezes indul..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Rendez" @@ -2021,20 +2021,20 @@ msgid "Sorting files" msgstr "Fajlok rendezese" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Hang" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Sebesseg" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Forog" @@ -2044,19 +2044,19 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil 21-26C homerseklet es egy merev allvany (asztal) szukseges." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statisztika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Halk" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Acellapok" @@ -2066,24 +2066,24 @@ msgid "Stop" msgstr "Allj" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Nyomt. megallitasa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Szigoru" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Tamogatas" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Felcserelve" @@ -2123,7 +2123,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ALACSONY FESZ." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2137,17 +2137,17 @@ msgid "Thermal model not calibrated yet." msgstr "A termikus modell még nincs kalibrálva." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Homerseklet" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Homersekletek" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Filament tesztelese" @@ -2168,7 +2168,7 @@ msgstr "" "mozgasat." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2188,39 +2188,39 @@ msgstr "" " fejezetenek Kalibracio menete bekezdeset." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Ido" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Idotullepes" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Ossz." #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Ossz. hiba" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Osszes filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Ossz. nyomt. ido" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Finomhangolas" @@ -2235,15 +2235,15 @@ msgid "Unload" msgstr "Kiadas" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Filament kiadasa" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Filament kiadasa" @@ -2260,12 +2260,12 @@ msgid "Unloading to pulley" msgstr "Kiadas a gorgohoz" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Ellenorzes sikertelen, vedd ki a filamentet es probald ujra." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Feszultsegek" @@ -2276,7 +2276,7 @@ msgid "WARNING TMC TOO HOT" msgstr "FIGYELEM A TMC FORRO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2294,18 +2294,18 @@ msgid "Wait for user..." msgstr "Var. a felhasznalora" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "A PINDA szenzor kihuleset varom." #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "A fuvoka es az asztal kihuleset varom." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Figylem." @@ -2330,141 +2330,141 @@ msgid "Was filament unload successful?" msgstr "Sikerult kivenni a filamentet?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Kabelezesi hiba" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Varazslo" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-korrekcio:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH inicializal" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ kal. reszlet" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ kalibracio OK. Az esetleges X/Y merolegessegi hiba automatikusan " "korrigalva lesz." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "XYZ kalibracio sikerult. Az X/Y tengelyeken enyhe merolegessegi hiba van." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Az XYZ kalibracio sikertelen. Az asztal kalibracios pontja nem erheto el." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracio sikertelen. Kerlek, nezz bele a kezikonyvbe." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracio OK. Az X/Y tengelyek merolegesek. Gratulalok!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y-minimum tavolsag" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-korrekcio:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Igen" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "A Varazsolt barmikor elered a Kalibracio -> Varazslo menubol." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-korrekcio:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z meres szama" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] pont offszet" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "es nyomd meg a gombot" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "filam. betoltesehez" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "filament kiadasahoz" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "ismeretlen" @@ -2474,13 +2474,13 @@ msgid "unknown state" msgstr "ismeretlen allapot" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Frissites" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU tap hibak" @@ -2518,8 +2518,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU ALFESZÜLTSÉ. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Anyagcserék" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 0a586ec2f..6dcc4f8d8 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 o superiore" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "atteso livello %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Annulla" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Compensaz. Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Nessun errore" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabeti" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Sempre" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Trova origine" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Automatico" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autocaric. filam." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Evito triturazione" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Assi" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Lunghezza dell'asse" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Indietro" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Piano" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Piano fatto." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Correz. liv.piano" @@ -170,18 +170,18 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Piano/Riscald." #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Stato cinghie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test cinghie" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare stampa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Chiaro" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Luminosita'" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERRORE COMUNICAZIONE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Calibra XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Calibra Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" "all'altezza massima. Click per terminare." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Calibrazione Home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Calibrazione" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Calibr. completa" @@ -271,120 +271,120 @@ msgstr "" "prima." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "SD rimossa" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Cambia scheda SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Cambia filamento" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Cambio riuscito!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Cambio corretto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Verifica asse X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Verifica asse Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Verifica asse Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Verifica piano" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Verifica finecorsa" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Verifica file" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Verifica ugello" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Controllo sensori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Controlli" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Cancella errore TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Colore non puro" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Contribuiti" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Raffredda" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Impatto" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Rileva.crash" @@ -394,7 +394,7 @@ msgid "Crash detected." msgstr "Rilevato impatto." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +405,24 @@ msgstr "" "in Modalita normale" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Taglia filamento" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Tagliatr." #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Scuro" @@ -432,7 +432,7 @@ msgid "Disable" msgstr "Disatt." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Disattiva motori" @@ -455,7 +455,7 @@ msgstr "" "impostata. Seguire manuale, Primi Passi, Calibrazione primo strato." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +469,7 @@ msgid "Done" msgstr "Fatto" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Correzione-E:" @@ -498,13 +498,13 @@ msgid "ERR Wait for User" msgstr "ERR Attendere utente" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "ERRORE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Espelli da MMU" @@ -516,17 +516,17 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Finecorsa" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Finec. fuori portata" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Finecorsa" @@ -538,30 +538,30 @@ msgid "Engaging idler" msgstr "Ingaggio idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Estrusore" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Info estrusore" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "Autocar.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Ril. blocco" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "Ril. fine fil" @@ -599,8 +599,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCC" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "Azione FS" @@ -625,36 +625,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Stat. fallimenti" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falso innesco" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Velocita vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventola" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Control.vent" @@ -683,41 +683,41 @@ msgid "Feeding to nozzle" msgstr "Alim. in ugello" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. esauriti" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Sensore fil." #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filamento" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. non caricato" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Sensore filam." @@ -750,42 +750,42 @@ msgstr "" "correttamente." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Fil. utilizzato" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Finaliz. spostamenti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Cal. primo strato" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Per primo avviero l'autotest per controllare gli errori di assemblaggio piu " "comuni." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flusso" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,18 +794,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Ventola frontale?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Fronte [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Ventola frontale/sin" @@ -854,13 +854,13 @@ msgstr "" "annullata." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "Impostazioni HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Riscald./Termist." @@ -882,7 +882,7 @@ msgid "Heating done." msgstr "Riscald. completo" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +893,7 @@ msgstr "" "stampare." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +902,9 @@ msgstr "" "processo di configurazione?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Forte" @@ -915,23 +915,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 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:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Ventola hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare fino a 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." @@ -956,7 +956,7 @@ msgid "INVALID TOOL" msgstr "STRUM NON VAL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +970,22 @@ msgid "Improving bed calibration point" msgstr "Miglioramento punto di calibrazione del piatto" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Schermata info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Inizial. scheda SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Inserire filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1000,14 +1000,14 @@ msgstr "" "Errore runtime interno. Provare a resettare la MMU o ad aggiornare il FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Piastra d'acciaio su piano riscaldato?" @@ -1017,98 +1017,98 @@ msgid "Iteration" msgstr "Iterazione" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Ultima stampa" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Errori ultima stampa" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Sinistra" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Vent SX hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Sinistra [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Liv. Chiaro" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Liv. Scuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Correzione lineare" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Compensazione Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Carica tutti" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Carica filamento" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Carica ugello" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Prova di carica." #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Caricando colore" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Caricando filamento" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Puleggia lenta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Forte" @@ -1123,8 +1123,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Errore interno FW MMU, resettare la MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "Mod. MMU" @@ -1134,7 +1134,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NON RISPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Riprova. Ripristino temperatura..." @@ -1145,14 +1145,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST FALLITO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Fallimenti MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Car MMU falliti" @@ -1167,28 +1167,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU non risponde. Controlla cavi e connettori." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU connessa" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Comp. Magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Menu principale" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Dev. misurata" @@ -1199,36 +1199,36 @@ msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Griglia" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Liv. griglia piano" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mod." #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Cambio modalita in corso..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modello" @@ -1249,28 +1249,28 @@ msgid "More details online." msgstr "Piu dettagli online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motore" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Sposta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Sposta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Sposta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Muovi asse" @@ -1282,10 +1282,10 @@ msgstr "Muovo il selettore" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/D" @@ -1295,14 +1295,14 @@ msgid "New firmware version available:" msgstr "Nuova vers. FW disponibile:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Nessuna SD" @@ -1312,65 +1312,65 @@ msgid "No move." msgstr "Nessun movimento." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Nessuno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normale" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Non connesso" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Non gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Adesso calibro la distanza fra ugello e superfice del piatto." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Ugello" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Cambio dell'ugello" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Dia.Ugello" @@ -1382,15 +1382,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Off" @@ -1403,19 +1403,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Singolo" @@ -1425,40 +1425,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERRORE TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "Calibrazione PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "Calib. PID completa" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "Calibrazione PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Calibrazione temperatura fallita" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1478,13 +1478,13 @@ msgid "Parking selector" msgstr "Posteggio selettore" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Metti in pausa" @@ -1504,7 +1504,7 @@ msgstr "" "punti. In caso l'ugello muova il foglio spegnere subito la stampante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1513,17 +1513,17 @@ msgstr "" "riprendi il Wizard." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Controllare il collegamento al sensore e rimuovere il filamento." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Verifica:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Pulisci il piatto, poi premi la manopola." @@ -1533,14 +1533,14 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,7 +1549,7 @@ msgstr "" "caricarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Carica il filamento, per favore." @@ -1560,7 +1560,7 @@ msgstr "Aprire la guida filam. e rimuovere il filam. a mano" #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Posizionate la piastra d'acciaio sul piano riscaldato." @@ -1571,12 +1571,12 @@ msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Rimuovete i materiali da spedizione" @@ -1592,7 +1592,7 @@ msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." @@ -1604,49 +1604,49 @@ msgstr "Prego aggiornare." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Attendere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Interr. corr." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Preriscalda" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Preriscalda. taglio" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Preriscalda. espuls." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Preriscald. carico" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Preriscald. scarico" @@ -1657,7 +1657,7 @@ msgid "Preparing blade" msgstr "Preparo la lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Premere la manopola" @@ -1667,33 +1667,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Stampa interrotta" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Vent.stam:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Stampa da SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Stampa in pausa" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Tempo di stampa" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Ind. IP stampante:" @@ -1739,12 +1739,12 @@ msgid "QUEUE FULL" msgstr "CODA PIENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "Porta RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Retro [µm]" @@ -1759,7 +1759,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Rinomina" @@ -1773,24 +1773,24 @@ msgstr "" "Controllare l'indice strumento nel G-code (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Riprendi stampa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Riprendi stampa" @@ -1812,17 +1812,17 @@ msgid "Returning selector" msgstr "Ritorno selettore" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Destra" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Destra [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1831,8 +1831,8 @@ msgstr "" "ricominciare dall'inizio. Continuare?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "Mem. SD" @@ -1858,12 +1858,12 @@ msgid "Searching bed calibration point" msgstr "Ricerca punti calibrazione piano" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Seleziona" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1874,25 +1874,25 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Seleziona il filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Seleziona lingua" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al " "vostro materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." @@ -1903,28 +1903,28 @@ msgid "Selecting fil. slot" msgstr "Seleziono slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Autotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Avvia autotest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Autotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Errore Autotest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Autotest fallito" @@ -1934,30 +1934,30 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info Sensore" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Imposta temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Impostazioni" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Deviaz. forte" @@ -1968,7 +1968,7 @@ msgid "Sheet" msgstr "Piano" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1981,18 +1981,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Stato finecorsa" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Silenz." #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Deviaz. lieve" @@ -2011,8 +2011,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Ordina" @@ -2023,20 +2023,20 @@ msgid "Sorting files" msgstr "Ordinando i file" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Suono" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Velocita" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Gira" @@ -2047,19 +2047,19 @@ msgstr "" "Sono necessari una temperatura ambiente di 21-26C e una superficie rigida." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistiche" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Silenz." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Piani d'acciaio" @@ -2069,24 +2069,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Arresta stampa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Esatto" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Supporto" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Scambiato" @@ -2126,7 +2126,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2140,17 +2140,17 @@ msgid "Thermal model not calibrated yet." msgstr "Modello termico non calibrato." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Provo il filamento" @@ -2171,7 +2171,7 @@ msgstr "" " sia nulla che ne blocchi il movimento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2191,39 +2191,39 @@ msgstr "" "Primi Passi - Sequenza di Calibrazione." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Cron." #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Totale fallimenti" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filamento totale" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Tempo stampa totale" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Regola" @@ -2238,15 +2238,15 @@ msgid "Unload" msgstr "Scarica" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Scarica filam." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Scaricando filamento" @@ -2263,12 +2263,12 @@ msgid "Unloading to pulley" msgstr "Scarico in puleggia" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Voltaggi" @@ -2279,7 +2279,7 @@ msgid "WARNING TMC TOO HOT" msgstr "ATTENZIONE TMC CALDO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2297,18 +2297,18 @@ msgid "Wait for user..." msgstr "Attendendo utente..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Avviso" @@ -2333,139 +2333,139 @@ msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Errore cablaggio" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Correzione-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "Inizializza XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Calibrazione XYZ corretta. La distorsione verra compensata automaticamente." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato " "trovato." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibraz. XYZ fallita. Consultare manuale." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Distanza Y dal min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Correzione-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "E possibile riprendere il Wizard in qualsiasi momento attraverso " "Calibrazione -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Correzione-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Nr. Z-test" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] punto offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "e cliccare manopola" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "per caricare il fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "per scaricare fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "sconosciuto" @@ -2475,13 +2475,13 @@ msgid "unknown state" msgstr "stato sconosciuto" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Ricaricare" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Manc. corr. MMU" @@ -2519,8 +2519,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "SOTTOTENSION MCU VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Scambi materiali" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 7e31badbc..b2fa0cc28 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 of nieuwer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s niveau verwacht" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Annuleren" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Z is ingesteld:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Allemaal goed" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Klaar. Happy printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Altijd" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Kamertemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Zijn beide Z wagen heelemaal boven?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Startpositie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Auto power" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autoladen filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Slijpen vermijden" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "As" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Aslengte" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Terug" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Bed" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Bed klaar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Bed niveau correct" @@ -170,18 +170,18 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Bed/Verwarming" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Riem status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Riemtest" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Stroomstoring. Print herstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Helder" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Helderheid" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "COMMUNICATIEFOUT" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibratie XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibratie Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibrere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" "stoppers. Druk knop als klaar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibreren start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibratie" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibratie klaar" @@ -271,120 +271,120 @@ msgstr "" "uitladen." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "SD verwijderd" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Wissel SD kaart" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Wissel filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Wissel geslaagd!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Wissel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Controleer X as" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Controleer Y as" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Controleer Z as" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Controleer bed" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Controleer endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Bestand controle" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Controleer hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Controleer sensors" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Checks" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "TM-fout wissen" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Kleur niet juist" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Van de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Door." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Afkoelen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Geselecteerde taal kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Crashdet." @@ -394,7 +394,7 @@ msgid "Crash detected." msgstr "Crash gedetecteerd." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +405,24 @@ msgstr "" "gebruikt worden" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Fil. knippen" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Mes" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Dim" @@ -432,7 +432,7 @@ msgid "Disable" msgstr "Uitschak" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Motoren uit" @@ -456,7 +456,7 @@ msgstr "" "calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +470,7 @@ msgid "Done" msgstr "Klaar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-correctie:" @@ -499,13 +499,13 @@ msgid "ERR Wait for User" msgstr "FOUT Wacht gebruiker" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "FOUT:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Uitwerp. van MMU" @@ -517,17 +517,17 @@ msgid "Ejecting filament" msgstr "Fil. word ontladen" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Eindstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Endstop niet geraakt" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Eindstops" @@ -539,30 +539,30 @@ msgid "Engaging idler" msgstr "Koppel spanrol" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F.Jam ontdek." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "FS. uitloop" @@ -600,8 +600,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA NIET FIL.VRIJ" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS actie" @@ -626,36 +626,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FOUT" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Foutstatistieken" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "MMU-Fouten" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Valse triggering" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Fan snelh." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Fan test" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Fans check" @@ -684,41 +684,41 @@ msgid "Feeding to nozzle" msgstr "Voeding tot tuit" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. fouten" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament extrudeert met de juiste kleur?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. niet geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Filamentsensor" @@ -750,42 +750,42 @@ msgstr "" " of er niets vastzit in de PTFE-buis. Controleer of de sensor goed leest." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Gebruikte filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Bestand onvolledig. Toch doorgaan?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Voortgang afwerken" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Eerste laag kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Ten eerste zullen we de zelftest uitvoeren om de meest voorkomende " "montageproblemen te controleren." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Stromen" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,18 +794,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Voorzijde fan?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Voorkant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Fans voor/links" @@ -854,13 +854,13 @@ msgstr "" "alsjeblieft. Druk geannuleerd." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW Configuratie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Verwarmer/Therm." @@ -882,7 +882,7 @@ msgid "Heating done." msgstr "Opwarmen klaar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +893,7 @@ msgstr "" "printen." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +902,9 @@ msgstr "" "installatieproces?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Hoog verm." @@ -915,23 +915,23 @@ msgid "Homing" msgstr "Startpositie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend op 280C! Tuit vervangen en aangedraaid volgens specificaties?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend fan:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Begin nu met xyz-kalibratie. Het kan tot 24 min. duren." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Begin nu met z-kalibratie." @@ -956,7 +956,7 @@ msgid "INVALID TOOL" msgstr "ONGELDIG TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +970,22 @@ msgid "Improving bed calibration point" msgstr "Verbetering van het bedijkingspunt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Info scherm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. SD kaart" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Voer filament in" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1001,14 +1001,14 @@ msgstr "" "werken." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Is filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Ligt de staalplaat op het bed?" @@ -1018,98 +1018,98 @@ msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Laatste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Laatste printfouten" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Linker hotend fan?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Linkerkant[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Helder waard" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Dim waarde" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Lineaire correctie" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Live Z aanpassen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Laad alle" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Tot tuit laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Ladingstest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Laden kleur" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Laden filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Losse riemschijf" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Hard" @@ -1124,8 +1124,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware interne fout, reset de MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU Mod" @@ -1135,7 +1135,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGEERT NIET" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: Temperatuur herstellen..." @@ -1146,14 +1146,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU ZELFTEST MISLUKT" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU fout" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU laadfout" @@ -1168,28 +1168,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU reageert niet. Controleer de bedrading en connectoren." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU verbonden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnet. comp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Hoofdmenu" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Scheefheid" @@ -1200,36 +1200,36 @@ msgid "Measuring reference height of calibration point" msgstr "Referentie hoogte van het kalibratiepunt meten" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Mesh bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Stand" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Moduswijziging bezig..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1250,28 +1250,28 @@ msgid "More details online." msgstr "Meer details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Verplaats X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Verplaats Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Verplaats Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "As verplaatsen" @@ -1283,10 +1283,10 @@ msgstr "Bewege selector" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/V" @@ -1296,14 +1296,14 @@ msgid "New firmware version available:" msgstr "Nieuwe firmware versie beschikbaar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nee" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Geen SD kaart" @@ -1313,65 +1313,65 @@ msgid "No move." msgstr "Geen beweging." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Geen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normaal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Niet verbonden" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Draait niet" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Begin met kalibratie tussen de tuit en het bed." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Opwarmen van de tuit voor PLA voor." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Verwijder nu de testprint van staalplaat." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Tuit" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Tuit wisselen" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Tuit d." @@ -1383,15 +1383,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Uit" @@ -1404,19 +1404,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Aan" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Eenmaal" @@ -1426,40 +1426,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSE TERMISCHE FOUT" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kalibratie klaar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibratie" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA opwarmen" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kalib." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA-kalibratie mislukt" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1479,13 +1479,13 @@ msgid "Parking selector" msgstr "Parkere selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauze" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Print pauzeren" @@ -1505,7 +1505,7 @@ msgstr "" "tuit. Als de tuit het papier beweegt, onmiddellijk uitschakelen." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1514,19 +1514,19 @@ msgstr "" "wizard door de printer opnieuw te starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" "AUB IR sensor ver- binding kontrolleren , verwijder filament indien " "aanwezig." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Controleer aub:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Maak het bed schoon en druk op de knop." @@ -1536,14 +1536,14 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Reinig de tuit voor de kalibratie. Druk op de knop wanneer gereed." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Steek a.u.b. filament in de extruder en druk op de knop om het te laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1552,7 +1552,7 @@ msgstr "" " te laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Laad a.u.b. eerst filament." @@ -1563,7 +1563,7 @@ msgstr "Open spanrol en verwijder filament handmatig." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Leg staalplaat op bed." @@ -1574,12 +1574,12 @@ msgid "Please press the knob to unload filament" msgstr "Druk op de knop om filament te verwijderen" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Trek onmiddellijk de filament eruit" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Verwijder eerst de transport beschermers." @@ -1595,7 +1595,7 @@ msgid "Please run XYZ calibration first." msgstr "Voer eerst de XYZ-kalibratie uit." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Verwijder eerst het filament en probeer het opnieuw." @@ -1607,49 +1607,49 @@ msgstr "Voer een upgrade uit" #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Even geduld aub" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Stroomstoringen" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Voorverwarmen" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Tuit voorverwarmen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Opwarmen van de tuit. Wacht aub." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Opwarm. te snijden" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Opwarm.te uitwerpen" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Opwarmen invoeren" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Opwarmen uitwerpen" @@ -1660,7 +1660,7 @@ msgid "Preparing blade" msgstr "Bereid mes voor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Druk op knop" @@ -1670,33 +1670,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Druk op de knop om de tuit voor te verwarmen en door te gaan." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Print afgebroken" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Print fan:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Print van SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Print pauzeren" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Print tijd" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Printer IP-adres:" @@ -1742,12 +1742,12 @@ msgid "QUEUE FULL" msgstr "QUEUE VOL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Achterkant[µm]" @@ -1763,7 +1763,7 @@ msgstr "" "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Hernoem" @@ -1777,24 +1777,24 @@ msgstr "" "de G-code voor filament index buiten bereik (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Print hervatten" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Hervatten print" @@ -1816,17 +1816,17 @@ msgid "Returning selector" msgstr "Selctor terugrijden" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Recht.kant[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1835,8 +1835,8 @@ msgstr "" " vanaf het begin. Doorgaan?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD kaart" @@ -1862,12 +1862,12 @@ msgid "Searching bed calibration point" msgstr "Zoeken bed kalibratiepunt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Selecteer" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1878,25 +1878,25 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Kies filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Kies taal" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw " "materiaal." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Selecteer de temperatuur die overeenkomt met uw materiaal." @@ -1907,28 +1907,28 @@ msgid "Selecting fil. slot" msgstr "Selectere fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Zelftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Zelftest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Zelftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Zelftest fout!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Zelftest mislukt" @@ -1940,30 +1940,30 @@ msgstr "" "kalibreren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Sensor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensor geverifieerd, verwijder nu het filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Temp. instellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Instellingen" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Erg scheef" @@ -1974,7 +1974,7 @@ msgid "Sheet" msgstr "Staalplaat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1987,18 +1987,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Toon endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Stil" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Beetje scheef" @@ -2017,8 +2017,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Er is een probleem opgetreden, Z-kalibratie afgedwongen ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sort." @@ -2029,20 +2029,20 @@ msgid "Sorting files" msgstr "Bestanden sorteren" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Geluid" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Snelheid" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Draait" @@ -2054,19 +2054,19 @@ msgstr "" "vereist." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistieken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Stil" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Staalplaten" @@ -2076,24 +2076,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Print stoppen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Gewisseld" @@ -2133,7 +2133,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ONDERVOLT. FOUT" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2147,17 +2147,17 @@ msgid "Thermal model not calibrated yet." msgstr "Thermo model nog ongekalibreerd." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatuur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Teste filament" @@ -2178,7 +2178,7 @@ msgstr "" "zit." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2198,39 +2198,39 @@ msgstr "" "handleiding, hoofdstuk First steps, section Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Tijd" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Time-out" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Totaal" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Totaal fouten" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Totaal fil." #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Totaal printtijd" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Fijnafstemming" @@ -2245,15 +2245,15 @@ msgid "Unload" msgstr "Ontla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Fil. uitwerpen" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Uitwerpen filament" @@ -2270,12 +2270,12 @@ msgid "Unloading to pulley" msgstr "Ontlade n. riemschi." #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verificatie mislukt, verwijder het filament en probeer het opnieuw." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Spanning" @@ -2286,7 +2286,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WAARSCH. TMC TE HEET" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2304,18 +2304,18 @@ msgid "Wait for user..." msgstr "Wacht op gebruiker.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Wachten op afkoelen van PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Wachten op afkoelen van tuit en bed" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Waarsch." @@ -2341,135 +2341,135 @@ msgid "Was filament unload successful?" msgstr "Is filament succes- vol verwijderd?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Aansluitingsfout" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-correctie:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ kal. details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ-kalibratie in orde. Scheefheid zal automatisch worden gecorrigeerd." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibratie in orde. X / Y-assen zijn licht scheef. Goed gedaan!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibratie niet gelukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibratie niet gelukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibratie mislukt. Raadpleeg de handleiding aub." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibratie ok. X / Y-assen staan loodrecht. Gefeliciteerd!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y afstand van min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-correctie:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "U kunt de wizard altijd hervatten via Kalibratie -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-correctie:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-test nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] punt offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "en druk op knop" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "om filament te laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "om fil. uitwerpen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "onbekend" @@ -2479,13 +2479,13 @@ msgid "unknown state" msgstr "Status onbekend" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Refresh" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU stroomstor." @@ -2523,8 +2523,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU ONDERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Materailwisseling." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index bccbc5d3b..3e867fd1f 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 eller nyere" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s nivå ventet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Justerer Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Alt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Alt klart. God printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Omgivelse" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Er venstre og høyre Z-vogn helt oppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Hjelp" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto hjem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Autostyrke" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "AutoLast filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Unngår sliping" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Akse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Akselengde" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Tilbake" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Seng" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Seng ferdig" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Plankorrekt seng" @@ -170,18 +170,18 @@ msgstr "" "omstart." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Seng/Varmer" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Beltestatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Belte test" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Oppdaget Strømbrudd! Gjenoppta print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Lys" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Lysstyrke" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKASJONSFEIL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" " trykk." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibrerer hjem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibrering ferdig" @@ -270,120 +270,120 @@ msgstr "" "Kan ikke utføre handling, filamentet er allerede lasted. Avless det først." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Kort fjernet" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Bytt SD kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Bytt filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Bytte vellykket!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Byttet riktig?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Sjekker X aksen" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Sjekker Y aksen" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Sjekker Z aksen" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Sjekker seng" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Sjekker endesensorer" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Sjekker fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Sjekker hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Sjekker sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "G-code sjekk" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Fjern TM-feil" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Farge ikke riktig" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Community laget" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Fort." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Nedkjøling" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kopiere det valgte språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Krasj" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Krasjdetek." @@ -393,7 +393,7 @@ msgid "Crash detected." msgstr "Krasj oppdaget." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,24 +404,24 @@ msgstr "" "Normal modus" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Kutt filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Kutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Dato:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Svak" @@ -431,7 +431,7 @@ msgid "Disable" msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Frigjør motorer" @@ -454,7 +454,7 @@ msgstr "" "manualen, under First Steps, for hvordan det første laget skal kalibreres." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +468,7 @@ msgid "Done" msgstr "Ferdig" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-korreksjon:" @@ -497,13 +497,13 @@ msgid "ERR Wait for User" msgstr "ERR Vent på Bruker" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "FEIL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Løs ut fra MMU" @@ -515,17 +515,17 @@ msgid "Ejecting filament" msgstr "Mater ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Endesensor" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Traff ikke endesens." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Endesensorer" @@ -537,30 +537,30 @@ msgid "Engaging idler" msgstr "Aktiverer tomgangsh." #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Ekstruderinfo" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autolast" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F. kork føle" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. Løput" @@ -598,8 +598,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. FAST" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS aksjon" @@ -624,36 +624,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEIL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Feilstatistikk" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Feil stat. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falskt utløsning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Viftehastighet" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Viftetest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Viftesjekk" @@ -682,41 +682,41 @@ msgid "Feeding to nozzle" msgstr "Mater til dyse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Tomt filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Kommer Filament ut og har riktig farge?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. ikke lastet" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Filamentsensor" @@ -748,40 +748,40 @@ msgstr "" "ingenting står fast i PTFE røret. Sjekk at sensoren leser riktig." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Brukt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Fil er ukomplett. Fortsette allikevel?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Avslutter bevegelser" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Førstelagskal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Først skal jeg kjøre en selvtest for å sjekke vanlige byggefeil." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flyt" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -790,18 +790,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Fremre printvifte?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Fremsiden [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Fremre/venstre vifte" @@ -848,13 +848,13 @@ msgstr "" "avbrutt." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "GW oppsett" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Varmer/Termistor" @@ -876,7 +876,7 @@ msgid "Heating done." msgstr "Oppvarming ferdig." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -886,7 +886,7 @@ msgstr "" "oppsett, hvor Z aksen blir kalibrert. Du er da klar til å printe." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -895,9 +895,9 @@ msgstr "" "gjennom oppsettprosessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Høy styrke" @@ -908,23 +908,23 @@ msgid "Homing" msgstr "Søker" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend på 280C! Dyse byttet og strammet til spesifikasjonene?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend-vifte:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nå skal jeg kjøre kalibreringen. Det kan ta opptil 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Nå kjører jeg Z-kalibreringen." @@ -949,7 +949,7 @@ msgid "INVALID TOOL" msgstr "UGYLDIG VERKTØY" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -963,22 +963,22 @@ msgid "Improving bed calibration point" msgstr "Forbedrer seng kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Infoskjerm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. SD kort" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Sett inn filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -991,14 +991,14 @@ msgid "" msgstr "Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Er filament lastet?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Er stålplaten på varmesenga?" @@ -1008,98 +1008,98 @@ msgid "Iteration" msgstr "Iterasjon" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Siste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Siste printfeil" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Venstre" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Venst. hotendvifte?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Vens. side[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Nivå Lyst" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Nivå Dimmet" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Lin. korreksjon" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Juster Live-Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Last Alle" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Last til dysen" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Lastetest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Laster farge" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Laster filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Løs reim" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Høyt" @@ -1114,8 +1114,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU fastvare intern feil, vennligst nullstill MMU-en." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU Mod." @@ -1125,7 +1125,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARER IKKE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: gjenoppretter temperatur..." @@ -1136,14 +1136,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELVTEST FEILET" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU feil" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU lastefeil" @@ -1158,28 +1158,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarer ikke. Sjekk ledninger og koblinger." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU tilkoblet" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnet komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Hovedmeny" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Målt skjevhet" @@ -1190,36 +1190,36 @@ msgid "Measuring reference height of calibration point" msgstr "Måler referansehøyde for kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Plan-nett" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Sengeplanering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Modus endres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modell" @@ -1240,28 +1240,28 @@ msgid "More details online." msgstr "Flere detaljer online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Beveg X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Beveg Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Beveg Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Beveg akse" @@ -1273,10 +1273,10 @@ msgstr "Flytter velger" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr " -" @@ -1286,14 +1286,14 @@ msgid "New firmware version available:" msgstr "Ny fastvare tilgjengelig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nei" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "SD-kort mangler" @@ -1303,65 +1303,65 @@ msgid "No move." msgstr "Ingen bevegelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Ikke tilkoblet" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Spinner ikke" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jeg vil nå kalibrere avstanden mellom tuppen av dysen og varmeplaten." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Jeg vil nå forvarme dysen for PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Fjern nå testprintet fra stålplaten." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Dyse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Dysebytte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Dyse diam." @@ -1373,15 +1373,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Av" @@ -1393,19 +1393,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "En gang" @@ -1415,40 +1415,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSET THERMISK FEIL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kal. ferdig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA varmes" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA kalibrering mislyktes" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1468,13 +1468,13 @@ msgid "Parking selector" msgstr "Parkerer velger" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pause printjobben" @@ -1494,7 +1494,7 @@ msgstr "" "dysen tar papiret, skru umiddelbart av printeren." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1503,18 +1503,18 @@ msgstr "" "omstarte printeren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" "Vennligst sjekk koblingen til IR sensorer. Last ut filament om lastet." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Venligst sjekk:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Rengjør stålplaten og trykk valghjulet." @@ -1524,13 +1524,13 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengjør dysen og trykk valghjulet." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Sett inn filament I ekstruderen og trykk valghjulet for å laste." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1539,7 +1539,7 @@ msgstr "" "laste." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Vennligst sett inn filament først." @@ -1550,7 +1550,7 @@ msgstr "Åpne taljedøren og fjern filamentet for hånd." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Plasser stålplaten på varmesenga." @@ -1561,12 +1561,12 @@ msgid "Please press the knob to unload filament" msgstr "Trykk valghjulet for å ta ut filamentet" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Trekk ut filamented med en gang" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Vennligst fjern sendingsbeskyttelsen først." @@ -1582,7 +1582,7 @@ msgid "Please run XYZ calibration first." msgstr "Vennligst fullfør XYZ kalibreringen først." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "" "Vennligst last ut filamentet først, deretter repeter denne handlingen." @@ -1595,49 +1595,49 @@ msgstr "Vennligst oppdater." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Vennligst vent" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Strømfeil" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Forvarming" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Forvarm dysen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Forvarmer dysen. Vennligst vent..." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Forvarmer for kutt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Forvarmer for utmat." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Forvarmer for last" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Forvarmer for fil." @@ -1648,7 +1648,7 @@ msgid "Preparing blade" msgstr "Forbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Trykk valghjulet" @@ -1658,33 +1658,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Trykk valghjulet for å forvarme dysen og fortsette." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Print avbrutt" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Printvifte:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Print fra SD-kort" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Print satt på pause" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Printetid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Printer IP adr.:" @@ -1727,12 +1727,12 @@ msgid "QUEUE FULL" msgstr "FULL KØ" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Baksiden [µm]" @@ -1747,7 +1747,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Gi nytt navn" @@ -1761,24 +1761,24 @@ msgstr "" "g-code for verktøys-inteks ut av rekkevidde (T0-T4)" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Nullstill" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Nullstill XYZ kal." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Gjenoppta print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Gjenopptar print" @@ -1800,17 +1800,17 @@ msgid "Returning selector" msgstr "Returnerer velger" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Høyre" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Høyre side[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1819,8 +1819,8 @@ msgstr "" "begynne på nytt. Fortsette?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD-kort" @@ -1846,12 +1846,12 @@ msgid "Searching bed calibration point" msgstr "Søker etter kalibreringspunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Velg" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1860,23 +1860,23 @@ msgstr "Velg filamenttype for Førstelags- kalibrering." #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Velg filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Velg språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Velg dysetemperatur som passer ditt materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Velg temperaturen som passer ditt materiale." @@ -1887,28 +1887,28 @@ msgid "Selecting fil. slot" msgstr "Velger fil. spor" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Selvtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Selvtest starter" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selvtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Selvtest feil!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Selvtest feilet" @@ -1919,30 +1919,30 @@ msgstr "" "Selvtest vil bli kjørt for å kalibrere nøyaktig sensorløs hjemposisjon." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Sensorinformasjon" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifiserte, fjern filamentet nå." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Satt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Innstillinger" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Stor skjevhet" @@ -1953,7 +1953,7 @@ msgid "Sheet" msgstr "Plate" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1966,18 +1966,18 @@ msgstr "" "%cNullstill" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Vis endesensorer" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Lydløs" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Lett skjevhet" @@ -1994,8 +1994,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problem møtt. Z aksjeplanering tvunget ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sorter" @@ -2006,20 +2006,20 @@ msgid "Sorting files" msgstr "Sorter filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Lyd" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Hastighet" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Spinner" @@ -2030,19 +2030,19 @@ msgstr "" "En stabil rom- temperatur på 21-26C og et solid underlag er nødvendig." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistikk" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Stille" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Stål plate" @@ -2052,24 +2052,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Stopp printjobb" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Streng" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "System info" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Byttet" @@ -2109,7 +2109,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC LAVSPENNING FEIL" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2123,17 +2123,17 @@ msgid "Thermal model not calibrated yet." msgstr "Termisk modell ikke kalibrert enda." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Tester filament" @@ -2152,7 +2152,7 @@ msgstr "" "Velgeren kan ikke gå hjem riktig. sjekk om noe står i veien for bevegelsen." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2172,39 +2172,39 @@ msgstr "" "hovedmenyen og følg Veilederen." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Dato" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Tidsavbrudd" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Totalt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Feil totalt" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filament totalt" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Printetid totalt" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Juster" @@ -2219,15 +2219,15 @@ msgid "Unload" msgstr "Last ut" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Last ut filament" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Laster ut filament" @@ -2244,12 +2244,12 @@ msgid "Unloading to pulley" msgstr "Utlaster til trinse" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verifisering feilet. Fjern filamentet og prøv igjen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Strøm/Volt" @@ -2260,7 +2260,7 @@ msgid "WARNING TMC TOO HOT" msgstr "VARSEL TMC FOR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2278,18 +2278,18 @@ msgid "Wait for user..." msgstr "Venter på bruker..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Venter på PINDA nedkjøling" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Venter på dyse- og platenedkjøling" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Advarsel" @@ -2314,135 +2314,135 @@ msgid "Was filament unload successful?" msgstr "Ble filamentet lastet helt ut?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Koblingsfeil" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Veileder" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-korreksjon:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ cal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibreringen er grei. Skjevhet blir justert automatisk." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibreringen er god. Godt jobba!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ kalibreringen feilet. Kalibreringspunkt ikke funnet." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kal. mislyktes. Vennligst rådfør med håndboken." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "XYZ kalibrering OK.\n" "X og Y aksen er perpendikulær. Gratulerer!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y distanse fra min." #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-korreksjon:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid starte Veilederen fra Kalibrering -> Veileder." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-korreksjon:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] punktforskyv." #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "og trykk på knappen" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "for filamentlast" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "for filament ut" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "ukjent" @@ -2452,13 +2452,13 @@ msgid "unknown state" msgstr "ukjent tilstand" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Forfriske" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU strøm feil" @@ -2496,8 +2496,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERSPENN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Materialutveksling" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index a39eab79a..739c65593 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "Oczekiwano wersji %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Anuluj" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Ustawianie Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Wszystko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfab" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Zawsze" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Otoczenie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Asyst." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto zerowanie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Automatycz" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autoladowanie fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Unikaj scierania" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Dlugosc osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Wstecz" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Stol" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Stol OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Korekta stolu" @@ -170,18 +170,18 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Stol/Grzanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Stan paskow" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test paskow" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia.Kontynowac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Jasnosc" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "BLAD KOMUNIKACJI" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibruj Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibruje Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" "ogranicznikow. Nacisnij, by potwierdzic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Zerowanie osi" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibracja" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibracja OK" @@ -270,120 +270,120 @@ msgstr "" "Nie mozna wykonac akcji, filament jest juz zaladowany. Rozladuj go najpierw." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Karta wyjeta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Zmiana karty SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Wymiana filamentu" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Wymiana ok!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Wymiana ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Kontrola stolu" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Kontrola krancowek" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Sprawdzanie pliku" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Kontrola hotendu" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Kontrola czujnikow" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Testy" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Wyczyść błąd TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Kolor zanieczysz." #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Od spolecznosci" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Kont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Chlodzenie" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Zderzen" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Wykr.zderzen" @@ -393,7 +393,7 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +405,24 @@ msgstr "" "trybie Normalnym" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Ciecie filamentu" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Nozyk" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Sciemn" @@ -432,7 +432,7 @@ msgid "Disable" msgstr "Wylacz" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -455,7 +455,7 @@ msgstr "" " z instrukcja: rozdzial Wprowadzenie." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +469,7 @@ msgid "Done" msgstr "Wyk." #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Korekcja-E:" @@ -498,13 +498,13 @@ msgid "ERR Wait for User" msgstr "ERR czekam na uzytk." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "BLAD:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Wysun z MMU" @@ -516,17 +516,17 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Krancowka" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Krancowki" @@ -538,30 +538,30 @@ msgid "Engaging idler" msgstr "Urucham. docisku" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Ekstruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "Autolad. fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "Zaciecie fil." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "Koniec fil." @@ -600,8 +600,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. ZABLOK." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "Akcja FS" @@ -626,36 +626,36 @@ msgid "FW RUNTIME ERROR" msgstr "BLAD DZIALANIA FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Statystyki bledow" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Bledy MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falszywy alarm" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Predkosc went." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test wentylatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Sprawd.went." @@ -684,41 +684,41 @@ msgid "Feeding to nozzle" msgstr "Podaw. do dyszy" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Konc.filamentu" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Czuj. filam." #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Czujnik filamentu" @@ -750,42 +750,42 @@ msgstr "" "nic nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Uzyty filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Konczenie druku" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Kal. 1. warstwy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas " "montazu." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Przeplyw" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,18 +794,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Przedni went. druku?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Przod [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Przedni/lewy wentyl." @@ -851,13 +851,13 @@ msgid "" msgstr "G-code pociety dla nowszego FW. Zaktualizuj FW. Druk anulowany." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "Ustawienia HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" @@ -879,7 +879,7 @@ msgid "Heating done." msgstr "Grzanie zakonczone" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -889,7 +889,7 @@ msgstr "" "krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -898,9 +898,9 @@ msgstr "" "ustawieniem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Wysoka wyd" @@ -911,24 +911,24 @@ msgid "Homing" msgstr "Bazowanie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" 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:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Went. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie to do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." @@ -953,7 +953,7 @@ msgid "INVALID TOOL" msgstr "BLEDNE NARZEDZIE" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -967,22 +967,22 @@ msgid "Improving bed calibration point" msgstr "Poprawa punktu kalibracji stolu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Ekran informacyjny" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Inic. karty SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Wprowadz filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +997,14 @@ msgid "" msgstr "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" @@ -1014,98 +1014,98 @@ msgid "Iteration" msgstr "Iteracja" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Ost. wydruk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Ostatnie bledy druku" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Lewa" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Lewo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Poziom jasn." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Poziom ciem." #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Korekcja liniowa" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Ustaw. Live Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Zalad. wszystkie" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Ladowanie fil." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Test ładowania" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Czyszcz. koloru" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Laduje filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Luzne kolo pasowe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Glosny" @@ -1120,8 +1120,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Blad wewnetrzny MMU FW, zresetuj MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "Tryb MMU" @@ -1131,7 +1131,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NIE ODPOWIADA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU wznaw. Nagrzewanie..." @@ -1142,14 +1142,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU BLAD SELFTEST" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Bledy MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Bledy lad. MMU" @@ -1164,28 +1164,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nie reaguje. Sprawdz okablowanie i zlacza." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU podlaczone" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Kor. magnesow" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Menu glowne" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Zmierz. skos" @@ -1196,36 +1196,36 @@ msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Siatka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Tryb" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Trwa zmiana trybu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1246,28 +1246,28 @@ msgid "More details online." msgstr "Więcej szczegółów online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Silnik" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Ruch osi X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Ruch osi Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Ruch osi Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Ruch osi" @@ -1279,10 +1279,10 @@ msgstr "Ruch wybieraka" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/D" @@ -1292,14 +1292,14 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Brak karty SD" @@ -1309,65 +1309,65 @@ msgid "No move." msgstr "Brak ruchu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Brak" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nie podlaczono" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Nie kreci sie" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Kalibruje odleglosc miedzy koncowka dyszy a powierzchnia druku." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Dysza" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Wymiana dyszy" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Sr. dyszy" @@ -1379,15 +1379,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Wyl" @@ -1400,19 +1400,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Wl" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "1-raz" @@ -1422,40 +1422,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUZA BLAD TERMICZNY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "Kalibracja PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "Kalibracja PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "Kalib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Kalibracja temperaturowa nieudana" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1475,13 @@ msgid "Parking selector" msgstr "Parkowanie wybieraka" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Wstrzym. wydruku" @@ -1501,7 +1501,7 @@ msgstr "" "punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,17 +1510,17 @@ msgstr "" "Asystenta przez restart drukarki." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Sprawdz:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -1530,13 +1530,13 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1545,7 +1545,7 @@ msgstr "" "zaladowac." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." @@ -1556,7 +1556,7 @@ msgstr "Odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Umiescic plyte stalowa na stole podgrzewanym." @@ -1567,12 +1567,12 @@ msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" @@ -1588,7 +1588,7 @@ msgid "Please run XYZ calibration first." msgstr "Najpierw uruchomic kalibracje XYZ" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." @@ -1600,49 +1600,49 @@ msgstr "Prosze zaktualizowac" #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Prosze czekac" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Zaniki zasil." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Grzanie" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." @@ -1653,7 +1653,7 @@ msgid "Preparing blade" msgstr "Przygot. ostrza" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Wcisnij pokretlo" @@ -1663,33 +1663,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Druk przerwany" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "WentWydruk:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Druk z karty SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Druk wstrzymany" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Czas druku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Adr. IP drukarki:" @@ -1735,12 +1735,12 @@ msgid "QUEUE FULL" msgstr "KOLEJKA PELNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Tyl [µm]" @@ -1755,7 +1755,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Zmien nazwe" @@ -1769,24 +1769,24 @@ msgstr "" " pod wzgledem indeksu narzedzia poza zakresem (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Wznowic wydruk" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Wznawianie druku" @@ -1808,17 +1808,17 @@ msgid "Returning selector" msgstr "Powrot wybieraka" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Prawa" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Prawo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1827,8 +1827,8 @@ msgstr "" "Kontynuowac?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "Karta SD" @@ -1854,12 +1854,12 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalib. na stole" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Wybierz" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1870,23 +1870,23 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Wybierz filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Wybor jezyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." @@ -1897,28 +1897,28 @@ msgid "Selecting fil. slot" msgstr "Wybieranie slotu fil" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Selftest startuje" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Blad selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Selftest nieudany" @@ -1930,30 +1930,30 @@ msgstr "" "krancowek" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info o sensorach" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Ustaw temperature:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Ustawienia" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Znaczny skos" @@ -1964,7 +1964,7 @@ msgid "Sheet" msgstr "Plyta" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1977,18 +1977,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Pokaz krancowki" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Cichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Lekki skos" @@ -2007,8 +2007,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sort." @@ -2019,20 +2019,20 @@ msgid "Sorting files" msgstr "Sortowanie plikow" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Dzwiek" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Predkosc" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Kreci sie" @@ -2043,19 +2043,19 @@ msgstr "" "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statystyki" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Cichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Plyty stalowe" @@ -2065,24 +2065,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Przerwanie druku" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Restr." #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Wsparcie" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Zamieniono" @@ -2122,7 +2122,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ZA NIS. NAPIECIE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2136,17 +2136,17 @@ msgid "Thermal model not calibrated yet." msgstr "Model termicznego nie zostal skalib." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperatury" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Test filamentu" @@ -2167,7 +2167,7 @@ msgstr "" " ruchu." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2187,39 +2187,39 @@ msgstr "" " Kroki." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Czas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Wyl. czas." #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Suma" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Suma bledow" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Zuzycie filamentu" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Laczny czas druku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Strojenie" @@ -2234,15 +2234,15 @@ msgid "Unload" msgstr "Rozladuj" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Rozladowanie fil" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Rozladowuje filament" @@ -2259,12 +2259,12 @@ msgid "Unloading to pulley" msgstr "Rozladow. do radelka" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Napiecia" @@ -2275,7 +2275,7 @@ msgid "WARNING TMC TOO HOT" msgstr "UWAGA TMC ZA GORACY" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2293,18 +2293,18 @@ msgid "Wait for user..." msgstr "Czekam na uzytk. ..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Ostrzez" @@ -2329,139 +2329,139 @@ msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Blad polaczenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Asystent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Korekcja-X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Kalibracja XYZ pomyslna. Skos bedzie automatycznie korygowany." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic " "montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "" "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic " "montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Korekcja-Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Tak" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Korekcja-Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Ilosc Pomiarow" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "i nacisnij pokretlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "aby zaladow. fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "aby rozlad. filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "nieznane" @@ -2471,13 +2471,13 @@ msgid "unknown state" msgstr "Stan nieznany" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Odswiezac" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Zaniki zas. MMU" @@ -2515,8 +2515,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU POD NAPIĘCI. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Wymiany materiałów" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 31ca29909..6f5816339 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 / mai nou" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "nivel %s asteptat" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Anuleaza" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Ajustare Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Totul OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Totul este OK. Distractie placuta!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Mereu" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Ambiental" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Este axa Z aliniata sus?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Put. auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Inc.auto Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,27 +116,27 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Axa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Lungime axa" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Inapoi" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Pat" @@ -153,7 +153,7 @@ msgid "Bed done" msgstr "Pat incalzit" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Nivelare pat" @@ -171,18 +171,18 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Incalzitor/Pat" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Status curele" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test curele" @@ -193,13 +193,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Pana de curent. Continuati printul?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Maxim" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Luminozitate ecran" @@ -209,17 +209,17 @@ msgid "COMMUNICATION ERROR" msgstr "EROARE DE COMUNICARE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Calibrare XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -229,12 +229,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,17 +243,17 @@ msgstr "" "butonul cand este gata." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Calibrare home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Calibrare" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Calibrare gata" @@ -272,120 +272,120 @@ msgstr "" "intai." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Card scos" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Schimba card SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Schimba filamentul" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Schimbare cu succes!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Schimbat corect?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Verificare axa X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Verificare axa Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Verificare axa Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Verificare pat" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Verif. endstop-uri" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Verif. fisier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Verificare hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Verificare senzori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Verificari" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Ștergeți eroare TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Culoare gresita" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Comunitate" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Racire" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Copiaza limba selectata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Coliz." #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Det.coliziune" @@ -395,7 +395,7 @@ msgid "Crash detected." msgstr "Coliziune detectata." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +406,24 @@ msgstr "" "doar in modul normal" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Taie filamentul" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Cutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Minim" @@ -433,7 +433,7 @@ msgid "Disable" msgstr "Dezactiv" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Oprire steppere" @@ -456,7 +456,7 @@ msgstr "" "manual, capitolul First steps, sectiunea First layer calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +470,7 @@ msgid "Done" msgstr "Gata" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-correctie:" @@ -499,13 +499,13 @@ msgid "ERR Wait for User" msgstr "ERR Astept utilizat." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "EROARE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Scoateți din MMU" @@ -517,17 +517,17 @@ msgid "Ejecting filament" msgstr "Se scoate filamentul" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Endstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Endstop neatins" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Endstop-uri" @@ -539,30 +539,30 @@ msgid "Engaging idler" msgstr "Cuplare idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Info. extruder" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "Autoload fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F. blocaj det" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "Fil. epuizat" @@ -600,8 +600,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCAT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "Actiune FS" @@ -626,36 +626,36 @@ msgid "FW RUNTIME ERROR" msgstr "Eroare FW RUNTIME" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Statistici erori" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Stat. erori MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "nu detect. schimbare" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Viteza vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventilator" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Verif. vent." @@ -684,41 +684,41 @@ msgid "Feeding to nozzle" msgstr "Incarcare la varf" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Epuizari Fil." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Senzor Fil." #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Fil. curge si are culoarea corecta?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Fil. nu e incarcat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Senz. de filament" @@ -750,42 +750,42 @@ msgstr "" " nu este nimic blocat in tub-ul PTFE. Verifica daca senz. funct. corect." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Filament folosit" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Fisier incomplet. Continua oricum?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Finalizare miscari" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Cal. first layer" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Mai intai, voi rula testele automate pentru a verifica cele mai intalnite " "probleme de asamblare." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,18 +794,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Vent. print?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Fata [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Ventilatoarele sunt" @@ -854,13 +854,13 @@ msgstr "" "Print anulat." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "Setup HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Incalzitor/Termistor" @@ -882,7 +882,7 @@ msgid "Heating done." msgstr "Incalzirea gata." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +893,7 @@ msgstr "" "printezi." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +902,9 @@ msgstr "" "automate si calibrarile?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Put. max" @@ -915,23 +915,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend la 280C! Varf schimbat si strans conf. specificatiei?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Voi rula calibrarea XYZ acum. Va dura până la 24 de min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Voi rula calibrarea Z acum." @@ -956,7 +956,7 @@ msgid "INVALID TOOL" msgstr "INSTRUMENT INVALID" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +970,22 @@ msgid "Improving bed calibration point" msgstr "Imbunatatirea punctului de calibrare al patului" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Ecran informatii" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. card SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Incarca filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -999,14 +999,14 @@ msgstr "" "ERR de rulare interna. Incercati sa resetati MMU sau actualizati firmwarul." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Este filamentul incarcat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Este suprafata de print pe pat?" @@ -1016,98 +1016,98 @@ msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Ultimul print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Erorile ultim. print" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Stanga" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Vent. hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Stanga [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Lum. maxim" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Lum. minim" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Corectie lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Reglare Z live" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Incarca toate" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Incarca filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Incarca la varf" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Incarcare Test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Incarcare culoare" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Incarcare filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Fulie slabita" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Tare" @@ -1122,8 +1122,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Intermal MMU ERR, Va rog resetati MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "Mod MMU" @@ -1133,7 +1133,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NU RASPUNDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Restabilirea temperaturii..." @@ -1144,14 +1144,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST. ESUATA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Erori MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "Err. incarc MMU" @@ -1166,28 +1166,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nu raspunde. Verificati cablajul si conectorii." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU conectat" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Comp. magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Meniu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Distorsiune" @@ -1198,36 +1198,36 @@ msgid "Measuring reference height of calibration point" msgstr "Masurare distanta de referinta pentru punctul de calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Calibrare mesh" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Schimbare mod in progres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1248,28 +1248,28 @@ msgid "More details online." msgstr "Mai multe detalii online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Miscare X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Miscare Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Miscare Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Miscare axe" @@ -1281,10 +1281,10 @@ msgstr "Miscare selector" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1294,14 +1294,14 @@ msgid "New firmware version available:" msgstr "Vers. de firmware noua disponibila:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nu" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Fara card SD" @@ -1311,65 +1311,65 @@ msgid "No move." msgstr "Fara miscare." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "N/A" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nu este conectat" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Nu se roteste" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Acum voi calibra distanta dintre varf si suprafata patului." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Acum voi preincalzi extruder-ul pentru PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Acum inlaturati printul de test de pe suprafata de print." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Varf" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Schimbare varf" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Diam. varf" @@ -1381,15 +1381,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Off" @@ -1400,19 +1400,19 @@ msgstr "Setari vechi detectate. PID, Esteps etc. de baza vor fi setate." #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "O data" @@ -1422,40 +1422,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "OPRIT THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "Calibrare PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "Calibrare PID gata" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "Calibrare PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Incalzire PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Calibrarea temperaturii a esuat" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1475,13 @@ msgid "Parking selector" msgstr "Parcare selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pauza print" @@ -1501,7 +1501,7 @@ msgstr "" "Daca varful prinde hartia, opriti imediat imprimanta." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,17 +1510,17 @@ msgstr "" "ul repornind imprimanta." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Verificati senzorul IR, scoateti filamentul daca exista." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Verificati:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Curatati patul si apoi apasati butonul pentru a continua." @@ -1530,7 +1530,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Curatati varful pentru calibrare. Apasati butonul cand terminati." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1538,7 +1538,7 @@ msgstr "" "incarca." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1547,7 +1547,7 @@ msgstr "" "pentru a-l incarca." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Va rugam incarcati filamentul mai intai." @@ -1558,7 +1558,7 @@ msgstr "Deschideti idler-ul si scoateti filamentul manual." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Asezati suprafata de print pe pat." @@ -1569,12 +1569,12 @@ msgid "Please press the knob to unload filament" msgstr "Apasati butonul pentru a scoate filamentul." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Va rugam scoateti filamentul imediat" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Va rugam scoateti protectiile de transport mai intai." @@ -1590,7 +1590,7 @@ msgid "Please run XYZ calibration first." msgstr "Va rugam rulati calibrarea XYZ mai intai." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Va rugam mai intai sa scoateti filamentul, apoi incercati din nou." @@ -1602,49 +1602,49 @@ msgstr "Va rugam actualizati" #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Va rog asteptati" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Err. alimentare" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Preincalzire" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Preincalziti varful!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Preincalzire extruder. Asteptati, va rugam." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Preincalz. incarcare" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Preincalz. scoatere" @@ -1655,7 +1655,7 @@ msgid "Preparing blade" msgstr "Pregatire lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Apasati butonul" @@ -1665,33 +1665,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Apasati butonul pentru a preincalzi extruder-ul si continuati." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Print anulat" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Vent. print:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Printare de pe SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Print oprit" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Durata print" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "IP imprimanta:" @@ -1737,12 +1737,12 @@ msgid "QUEUE FULL" msgstr "QUEUE PLIN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Spate [µm]" @@ -1757,7 +1757,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Scoateti fil. vechi si apasati butonul pentru a incarca nou." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Redenumeste" @@ -1771,24 +1771,24 @@ msgstr "" "Verifica G-codul ptr indexul instrum. in afara intervalului (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset." #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset. calibr. XYZ" #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Continua print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Reluare print..." @@ -1810,17 +1810,17 @@ msgid "Returning selector" msgstr "Returnare selector" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Dreapta" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Dreapta [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1829,8 +1829,8 @@ msgstr "" " de la inceput. Continuati?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "Card SD" @@ -1856,12 +1856,12 @@ msgid "Searching bed calibration point" msgstr "Se cauta punctele de calibrare" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Selecteaza" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1872,24 +1872,24 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Select. filamentul:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Selectati limba" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selectati temperatura de preheat a extruder-ului pentru materialul ales." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Selectati temp. potrivita pentru materialul curent." @@ -1900,28 +1900,28 @@ msgid "Selecting fil. slot" msgstr "Selectare slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Testare automata OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Start Autotestare" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Testare automata" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Err. test. automata!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Autotestare esuata" @@ -1932,30 +1932,30 @@ msgstr "" "Testarea automata va fi rulata pentru a calibra sensorless rehoming-ul." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Info. senzori" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Senzorul a fost verificat, scoate filamentul." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Setati temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Setari" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Deform. severa" @@ -1966,7 +1966,7 @@ msgid "Sheet" msgstr "Suprafata" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,18 +1979,18 @@ msgstr "" "%cReset." #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Stare endstop-uri" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Silent." #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Dist. usoara" @@ -2009,8 +2009,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "A fost intalnita o problema, calibrarea Z a fost initiata..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sortare" @@ -2021,20 +2021,20 @@ msgid "Sorting files" msgstr "Sortare fisiere..." #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Sunet" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Viteza" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Se roteste" @@ -2045,19 +2045,19 @@ msgstr "" "Temp. ambient. stabila (21-26C) si o suprafata de lucru rigida necesare." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistici" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Silent." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Suprafete print" @@ -2067,24 +2067,24 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Oprire print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Strict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Informatii" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "inversate" @@ -2124,7 +2124,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR subtensiune TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2138,17 +2138,17 @@ msgid "Thermal model not calibrated yet." msgstr "Modelul termic nu este inca calibrat." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturi" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Testare filament" @@ -2169,7 +2169,7 @@ msgstr "" "blocheza miscarea." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2188,39 +2188,39 @@ msgstr "" "First steps, sectiunea Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Data" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Total erori" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filament total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Durata totala print" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Optiuni" @@ -2235,15 +2235,15 @@ msgid "Unload" msgstr "Unload" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Descarca filam." #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Scoatere filament" @@ -2260,12 +2260,12 @@ msgid "Unloading to pulley" msgstr "Scoatere la pully" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verificarea a esuat, scoateti filamentul si incercati din nou." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Voltaje" @@ -2276,7 +2276,7 @@ msgid "WARNING TMC TOO HOT" msgstr "TMC SUPRAINCALZIT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2294,18 +2294,18 @@ msgid "Wait for user..." msgstr "Se asteapta..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Se asteapta racirea probei PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Se ateapta racirea extruder-ului si a patului" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Avert." @@ -2330,51 +2330,51 @@ msgid "Was filament unload successful?" msgstr "Filamentul a fost scos cu succes?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Eroare de cablare" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Corect. X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "Init XFLASH" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Detalii cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibrarea XYZ in regula. Distorsiunea va fi corectata automat." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibrarea XYZ in regula. Axele X/Y sunt distorsionate putin. Felicitari!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Calibrarea XYZ compromisa. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" @@ -2382,89 +2382,89 @@ msgstr "" "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrarea XYZ a esuat. Un punct de calibrare a patului nu a fost gasit." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrarea XYZ a esuat. Va rugam consultati manualul." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata dreapta nu pot fi " "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrarea XYZ ok. Axele X/Y sunt perpendiculare. Felicitari!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Distanta Y de la min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Corect. Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Puteti oricand sa reluati Wizard-ul din Calibrare -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Corect. Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Nr. Z-probe" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] offset origine" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "si apasa butonul" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "a incarca filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "a scoate filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "necunoscut" @@ -2474,13 +2474,13 @@ msgid "unknown state" msgstr "vers. necunoscuta" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Reimprospata" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "Err. MMU curent" @@ -2518,8 +2518,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU SUBTENSIUNE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Schimburi material" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index a05cdde4f..2662a27c1 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 a novsie" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "Ocakavana verzia %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Doladenie Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Vsetko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Vsetko je hotove!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Okolie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Dosli oba Z voziky k hornemu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autozav. filamentu" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Dlzka osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Spat" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Podlozka" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Podlozka OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Korekcia podlozky" @@ -169,18 +169,18 @@ msgstr "" "Kalibracia Z zlyhala. Sensor nezopol. Znecistena tryska? Cakam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Podlozka/Zohrievanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Stav remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Test remena" @@ -191,13 +191,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Nastal vypadok prudu. Obnovit tlac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Jasne" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Podsvietenie" @@ -207,17 +207,17 @@ msgid "COMMUNICATION ERROR" msgstr "COMMUNICATION ERROR" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibracia XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,12 +227,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibrujem Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +241,17 @@ msgstr "" "tlacidlom." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibr. vychodziu p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibracia" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibracia OK" @@ -269,120 +269,120 @@ msgstr "" "Nie je mozne vykonat akciu, filament je uz zavedeny. Najskor ho vytiahnite." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Karta vysunuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Zmenit SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Vymenit filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Vymena uspesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Kontrolujem subor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Kontrola senzorov" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Kontroly" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Vymazanie chyby TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Nespravna farba" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Komunitny prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Pokr." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Schladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Det. narazu" @@ -392,7 +392,7 @@ msgid "Crash detected." msgstr "Zisteny naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +403,24 @@ msgstr "" "Normalnom rezime" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Odstrihnut filam." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Strihanie" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Tmavy" @@ -430,7 +430,7 @@ msgid "Disable" msgstr "Vypnut" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Vypnut motory" @@ -453,7 +453,7 @@ msgstr "" "manualu, kapitola Zaciname, odstavec Nastavenie prvej vrstvy." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -467,7 +467,7 @@ msgid "Done" msgstr "Hotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "Korekcia E:" @@ -496,13 +496,13 @@ msgid "ERR Wait for User" msgstr "ERR Wait for User" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Vysunúť z MMU" @@ -514,17 +514,17 @@ msgid "Ejecting filament" msgstr "Vysunutie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Kon. spinac nezopol" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Konc. spinace" @@ -536,30 +536,30 @@ msgid "Engaging idler" msgstr "Zapojenie idlera" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F. zasek" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. vypadok" @@ -597,8 +597,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STUCK" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS Akcia" @@ -623,36 +623,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Statistiky zlyhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Zlyhania MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Falosne spustenie" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Kontr. vent." @@ -681,41 +681,41 @@ msgid "Feeding to nozzle" msgstr "Zavedenie do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Filament vytlaceny a spravnej farby?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Filament nezavedeny" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -747,42 +747,42 @@ msgstr "" " ci je PTFE trubicka priechodzia a senzor funguje spravne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Spotrebovany filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Subor nekompletny. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Dokoncovanie pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Kal. prvej vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najskor pomocou selftestu skontrolujem nejcastejsie chyby vznikajuce pri " "zostaveni tlaciarne." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Prietok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,18 +791,18 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Predny tlacovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Predna st.[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Predny/lavy vent." @@ -850,13 +850,13 @@ msgstr "" "zrusena." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW nastavenie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Zohr./Termistor" @@ -878,7 +878,7 @@ msgid "Heating done." msgstr "Zahrievanie OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +888,7 @@ msgstr "" "nastavenia, v ktorom skalibrujem os Z. Potom budete moct zacat tlacit." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +897,9 @@ msgstr "" "previedla kalibracnym procesom?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Vys. vykon" @@ -910,23 +910,23 @@ msgid "Homing" msgstr "Navrat" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend ma 280C! Tryska je vymenena a utiahnuta podla specifikacie?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Teraz urobim XYZ kalibraciu. Zaberie to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Teraz urobim kalibraciu Z." @@ -951,7 +951,7 @@ msgid "INVALID TOOL" msgstr "INVALID TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -965,22 +965,22 @@ msgid "Improving bed calibration point" msgstr "Zlepsenie bodu kalibracie podlozky" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Informacie" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Nacitanie SD karty" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -993,14 +993,14 @@ msgid "" msgstr "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Je filament zavedeny?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Je platna na podlozke?" @@ -1010,98 +1010,98 @@ msgid "Iteration" msgstr "Opakovanie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Posledna tlac" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Zlyhanie posl. tlace" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Vlavo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Lavy vent na tryske?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Lava str.[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Normalne" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Stlmene" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Korekcia lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Doladenie osi Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Zaviest vsetko" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Zaviest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Zaved. do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Záťažový test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Cistenie farby" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Zavedenie filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Uvolnena remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Hlasny" @@ -1116,8 +1116,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Chyba MMU Firmwaru, resetujte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU mod" @@ -1127,7 +1127,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NOT RESPONDING" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Obnovenie teploty..." @@ -1138,14 +1138,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SAMOTEST ZLYHAL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "Zlyhanie MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU zlyhalo" @@ -1160,28 +1160,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpoveda. Skontrolujte zapojenie a konektory." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU pripojene" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Hlavna ponuka" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Merane skos." @@ -1192,36 +1192,36 @@ msgid "Measuring reference height of calibration point" msgstr "Meriam referencnu vysku kalibracneho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Mriezka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Vyrovnanie podl." #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Rezim" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Prebieha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Model" @@ -1242,28 +1242,28 @@ msgid "More details online." msgstr "Viac podrobnosti online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Posunut X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Posunut Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Posunut Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Posunut os" @@ -1275,10 +1275,10 @@ msgstr "Presun selektora" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1288,14 +1288,14 @@ msgid "New firmware version available:" msgstr "Vysla nova verzia firmware:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Ziadna SD karta" @@ -1305,66 +1305,66 @@ msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Ziadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Nezapojene" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Netoci sa" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Teraz skalibrujem vzdialenost medzi koncom trysky a povrchom podlozky." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Teraz predohrejem trysku pre PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Teraz odstrante testovaci vytlacok z platne." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Vymena trysky" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Tryska" @@ -1376,15 +1376,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Vyp" @@ -1395,19 +1395,19 @@ msgstr "Neplatne hodnoty nastavenia. Bude pouzite predvolene PID, Esteps atd." #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "Raz" @@ -1417,40 +1417,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSED THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibracia" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "Nahrievanie PINDA" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "Kalibracia PINDA zlyhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1470,13 +1470,13 @@ msgid "Parking selector" msgstr "Parkovanie selektora" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pozastavit tlac" @@ -1496,7 +1496,7 @@ msgstr "" "tryska zachytí papier, ihneď vypnite tlačiareň." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1505,17 +1505,17 @@ msgstr "" "restartovanim tlaciarne." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Prosim skontrolujte zapojenie IR senzoru a vyberte filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Skontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistite podlozku a stlacte tlacidlo." @@ -1526,14 +1526,14 @@ msgstr "" "Pre uspesnu kalibraciu ocistite prosim tlacovu trysku. Potvrdte tlacidlom." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Prosim vlozte filament do extruderu a stlacte tlacidlo k jeho zavedeniu" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1542,7 +1542,7 @@ msgstr "" "zavedeniu" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Prosim najskor zavedte filament" @@ -1553,7 +1553,7 @@ msgstr "Prosim otvorte idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Umiestnite prosim platnu na podlozku" @@ -1564,12 +1564,12 @@ msgid "Please press the knob to unload filament" msgstr "Pre vysunutie filamentu stlacte tlacidlo" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Prosim vyberte urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Najskor prosim odstrante prevozne pomocky." @@ -1585,7 +1585,7 @@ msgid "Please run XYZ calibration first." msgstr "Najskor spustite kalibraciu XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyberte filament a zopakujte tuto akciu" @@ -1597,49 +1597,49 @@ msgstr "Aktualizujte prosim." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Cakajte prosim" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Vypadky prudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Predohrev" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Predohrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Predhrev trysky. Prosim cakajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Predohrev k strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Predhrev k vysunutiu" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Predhrev k zavedeniu" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Predohrev k vybratiu" @@ -1650,7 +1650,7 @@ msgid "Preparing blade" msgstr "Priprava cepele" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Stlacte tlacidlo" @@ -1660,33 +1660,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Pre nahriatie trysky a pokracovanie stlacte tlacidlo." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Tlac prerusena" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Tlacovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Tlac z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Tlac pozastavena" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Cas tlace" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "IP adr. tlaciarne:" @@ -1732,12 +1732,12 @@ msgid "QUEUE FULL" msgstr "QUEUE FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Zadna str.[µm]" @@ -1752,7 +1752,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyberte stary filament a stlacte tlacidlo pre zavedenie noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Premenovat" @@ -1766,24 +1766,24 @@ msgstr "" "nastroj mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Obnovenie tlace" @@ -1805,17 +1805,17 @@ msgid "Returning selector" msgstr "Navrat selektora" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Prava str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1824,8 +1824,8 @@ msgstr "" "kalibracny proces od zaciatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD karta" @@ -1851,12 +1851,12 @@ msgid "Searching bed calibration point" msgstr "Hladam kalibracny bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1865,23 +1865,23 @@ msgstr "Zvolte filament pre kalibraciu prvej vrstvy z nasledujuceho menu" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predohrevu trysky ktora zodpoveda vasmu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktora odpoveda vasmu materialu." @@ -1892,28 +1892,28 @@ msgid "Selecting fil. slot" msgstr "Vyber slotu fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Samotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Zaciatok testu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Samotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Chyba samotestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Samotest zlyhal" @@ -1923,30 +1923,30 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Bude spusteny test pre kalibraciu presneho navratu." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Senzor overeny, vyberte filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Nastavenia" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Tazke skos." @@ -1957,7 +1957,7 @@ msgid "Sheet" msgstr "Platna" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1970,18 +1970,18 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Tichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Lahke skos." @@ -2000,8 +2000,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytol sa problem, zarovnam os Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Triedit" @@ -2012,20 +2012,20 @@ msgid "Sorting files" msgstr "Triedenie suborov" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Toci sa" @@ -2035,19 +2035,19 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilna izbova teplota 21-26C a pevna podlozka." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Platne" @@ -2057,24 +2057,24 @@ msgid "Stop" msgstr "Zast." #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Zastavit tlac" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Prehodene" @@ -2114,7 +2114,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2128,17 +2128,17 @@ msgid "Thermal model not calibrated yet." msgstr "Termálny model zatiaľ nebol kalibrovaný" #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Kontrola filamentu" @@ -2159,7 +2159,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2178,39 +2178,39 @@ msgstr "" "Zaciname, sekcia Postup kalibracie." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Casovac" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Celkom" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Celkom zlyhani" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Filament celkom" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Celkovy cas tlace" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Ladit" @@ -2225,15 +2225,15 @@ msgid "Unload" msgstr "Vysuv" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Vybrat filament" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Vysuvanie filamentu" @@ -2250,12 +2250,12 @@ msgid "Unloading to pulley" msgstr "Vysuv. do remenice" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Overenie zlyhalo, vyberte filament a skuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Napatie" @@ -2266,7 +2266,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WARNING TMC TOO HOT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2284,18 +2284,18 @@ msgid "Wait for user..." msgstr "Caka sa na uzivatela" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Caka sa na ochladenie PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Cakanie na schladenie trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Varovat" @@ -2320,135 +2320,135 @@ msgid "Was filament unload successful?" msgstr "Bolo vysunutie filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Chyba zapojenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Sprievodca" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "Korekcia X:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Kalibracia XYZ v poriadku. Skosenie bude automaticky vyrovnane pri tlaci." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracia XYZ v poriadku. X/Y osi mierne skosene. Dobra praca!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibracia XYZ je nepresna. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracia XYZ je nepresna. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracia XYZ zlyhala. Kalibracny bod podlozky nenajdeny." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibracia XYZ zlyhala. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracia XYZ zlyhala. Nahliadnite do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibracia XYZ zlyhala. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracia XYZ v poradku. X/Y osi su kolme. Gratulujeme!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y vzdialenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Korekcia Y:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Sprievodcu mozete kedykolvek znovu spustit z menu Kalibracia -> Sprievodca" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Korekcia Z:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Pocet merani Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] odsadenie bodu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "a stlacte tlacidlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "k zavedeniu filam." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "k vybraniu filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "neznamy" @@ -2458,13 +2458,13 @@ msgid "unknown state" msgstr "neznamy stav" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Obnovit" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU vyp. prudu" @@ -2502,8 +2502,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERVOLTAGE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Výmena materiálu" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index aaf6121ac..037175170 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -28,81 +28,81 @@ msgid " 0.4 or newer" msgstr " 0.4 el nyare" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6885 msgid "%s level expected" msgstr "%s nivå förväntad" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1971 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 +#: ../../Firmware/ultralcd.cpp:3691 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=15 #. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2651 +#: ../../Firmware/ultralcd.cpp:2656 msgid "Adjusting Z:" msgstr "Justerar Z:" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/ultralcd.cpp:7155 msgid "All correct" msgstr "Allt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 msgid "All is done. Happy printing!" msgstr "Allt är klart. God utskrift!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4651 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1385 +#: ../../Firmware/ultralcd.cpp:1390 msgid "Ambient" msgstr "Omgivande" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2873 +#: ../../Firmware/ultralcd.cpp:2878 msgid "Are left and right Z~carriages all up?" msgstr "Är båda Z-vagnarna helt uppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4327 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 #: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4720 msgid "Auto home" msgstr "Auto hem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:5627 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:5632 msgid "Auto power" msgstr "Auto kraft" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5432 +#: ../../Firmware/ultralcd.cpp:5437 msgid "AutoLoad filament" msgstr "Autoladda filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2294 +#: ../../Firmware/ultralcd.cpp:2299 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,27 +115,27 @@ msgid "Avoiding grind" msgstr "Undviker slipning" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6859 +#: ../../Firmware/ultralcd.cpp:6864 msgid "Axis" msgstr "Axel" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/ultralcd.cpp:6863 msgid "Axis length" msgstr "Axellängd" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2724 -#: ../../Firmware/ultralcd.cpp:4123 ../../Firmware/ultralcd.cpp:5709 -#: ../../Firmware/ultralcd.cpp:7657 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 +#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 +#: ../../Firmware/ultralcd.cpp:7667 msgid "Back" msgstr "Tillbaka" #. MSG_BED c=13 #: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 #: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1383 ../../Firmware/ultralcd.cpp:5582 -#: ../../Firmware/ultralcd.cpp:5733 +#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 +#: ../../Firmware/ultralcd.cpp:5738 msgid "Bed" msgstr "Bädd" @@ -152,7 +152,7 @@ msgid "Bed done" msgstr "Bädd klar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4727 +#: ../../Firmware/ultralcd.cpp:4732 msgid "Bed level correct" msgstr "Bäddnivå korrekt" @@ -170,18 +170,18 @@ msgstr "" " på återställning." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6816 +#: ../../Firmware/ultralcd.cpp:6821 msgid "Bed/Heater" msgstr "Bädd/Värmare" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1436 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 +#: ../../Firmware/ultralcd.cpp:1710 msgid "Belt status" msgstr "Bält status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4717 +#: ../../Firmware/ultralcd.cpp:4722 msgid "Belt test" msgstr "Bält test" @@ -192,13 +192,13 @@ msgid "Blackout occurred. Recover print?" msgstr "Blackout inträffat. Återställa utskr?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 msgid "Bright" msgstr "Ljus" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4662 -#: ../../Firmware/ultralcd.cpp:5637 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 +#: ../../Firmware/ultralcd.cpp:5642 msgid "Brightness" msgstr "Ljusstyrka" @@ -208,17 +208,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4721 +#: ../../Firmware/ultralcd.cpp:4726 msgid "Calibrate XYZ" msgstr "Kalibrera XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4723 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 msgid "Calibrate Z" msgstr "Kalibrera Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2835 +#: ../../Firmware/ultralcd.cpp:2840 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,12 +228,12 @@ msgstr "" #. MSG_CALIBRATE_Z_AUTO c=20 r=2 #: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:577 +#: ../../Firmware/ultralcd.cpp:582 msgid "Calibrating Z" msgstr "Kalibrerar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2834 +#: ../../Firmware/ultralcd.cpp:2839 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +242,17 @@ msgstr "" "Klicka när du är klar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:7157 msgid "Calibrating home" msgstr "Kalibrerar hem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:588 +#: ../../Firmware/ultralcd.cpp:593 msgid "Calibration done" msgstr "Kalibraring utförd" @@ -270,120 +270,120 @@ msgstr "" "Kan inte utföra åtgärden, filament är redan laddat. Ta bort det först." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7544 +#: ../../Firmware/ultralcd.cpp:7554 msgid "Card removed" msgstr "Kort borttaget" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5396 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Change SD card" msgstr "Byt ut SD-kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5350 -#: ../../Firmware/ultralcd.cpp:5591 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5596 msgid "Change filament" msgstr "Ändra filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2172 +#: ../../Firmware/ultralcd.cpp:2177 msgid "Change success!" msgstr "Ändring utförd!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2220 +#: ../../Firmware/ultralcd.cpp:2225 msgid "Changed correctly?" msgstr "Ändring korrekt?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6031 -#: ../../Firmware/ultralcd.cpp:7142 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 +#: ../../Firmware/ultralcd.cpp:7147 msgid "Checking X axis" msgstr "Kontroll X-axel" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6040 -#: ../../Firmware/ultralcd.cpp:7143 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 +#: ../../Firmware/ultralcd.cpp:7148 msgid "Checking Y axis" msgstr "Kontroll Y-axel" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7149 msgid "Checking Z axis" msgstr "Kontroll Z-axel" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 msgid "Checking bed" msgstr "Kontroll bädd" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7141 +#: ../../Firmware/ultralcd.cpp:7146 msgid "Checking endstops" msgstr "Kontroll ändlägen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7239 +#: ../../Firmware/ultralcd.cpp:7244 msgid "Checking file" msgstr "Kontrollerar fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/ultralcd.cpp:7152 msgid "Checking hotend" msgstr "Kontroll hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7148 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 +#: ../../Firmware/ultralcd.cpp:7154 msgid "Checking sensors" msgstr "Kontroll sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4555 +#: ../../Firmware/ultralcd.cpp:4560 msgid "Checks" msgstr "Kontroller" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5385 +#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 msgid "Clear TM error" msgstr "Rensa TM-fel" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2228 msgid "Color not correct" msgstr "Färg ej korrekt" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3576 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 msgid "Community made" msgstr "Allmänhetsgjord" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4145 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 msgid "Cont." msgstr "Frts." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2131 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 msgid "Cooldown" msgstr "Kyla ner" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3514 +#: ../../Firmware/ultralcd.cpp:3519 msgid "Copy selected language?" msgstr "Kopiera det valda språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1226 -#: ../../Firmware/ultralcd.cpp:1255 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 +#: ../../Firmware/ultralcd.cpp:1260 msgid "Crash" msgstr "Krock" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4234 ../../Firmware/ultralcd.cpp:4236 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5615 -#: ../../Firmware/ultralcd.cpp:5619 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 +#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 +#: ../../Firmware/ultralcd.cpp:5624 msgid "Crash det." msgstr "Krockdetekt." @@ -393,7 +393,7 @@ msgid "Crash detected." msgstr "Krock upptäckt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3418 +#: ../../Firmware/ultralcd.cpp:3423 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,24 +404,24 @@ msgstr "" "normalt läge" #. MSG_CUT_FILAMENT c=17 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:314 -#: ../../Firmware/ultralcd.cpp:5002 ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 +#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" msgstr "Skär filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4182 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 msgid "Cutter" msgstr "Skärare" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1646 +#: ../../Firmware/ultralcd.cpp:1651 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 msgid "Dim" msgstr "Dim" @@ -431,7 +431,7 @@ msgid "Disable" msgstr "Inaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4596 msgid "Disable steppers" msgstr "Inaktivera stepper" @@ -454,7 +454,7 @@ msgstr "" "Vänligen följ manualen Första lagrets kalibrering." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4007 +#: ../../Firmware/ultralcd.cpp:4012 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +468,7 @@ msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4076 +#: ../../Firmware/ultralcd.cpp:4081 msgid "E-correct:" msgstr "E-korrektion:" @@ -497,13 +497,13 @@ msgid "ERR Wait for User" msgstr "FEL Inväntar anv" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2275 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 msgid "ERROR:" msgstr "FEL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:318 -#: ../../Firmware/ultralcd.cpp:4984 ../../Firmware/ultralcd.cpp:5423 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 +#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 msgid "Eject from MMU" msgstr "Utmat från MMU" @@ -515,17 +515,17 @@ msgid "Ejecting filament" msgstr "Matar ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6829 +#: ../../Firmware/ultralcd.cpp:6834 msgid "Endstop" msgstr "Ändläge" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6839 msgid "Endstop not hit" msgstr "Ändlage inte nått" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6820 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Endstops" msgstr "Ändlägen" @@ -537,30 +537,30 @@ msgid "Engaging idler" msgstr "Koppla in Idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3392 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1701 +#: ../../Firmware/ultralcd.cpp:1706 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 +#: ../../Firmware/ultralcd.cpp:4142 msgid "F. autoload" msgstr "F. autoladdn" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:4139 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:4144 msgid "F. jam detect" msgstr "F.stopp skett" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4136 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4141 msgid "F. runout" msgstr "F. slut" @@ -598,8 +598,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STOPP" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4145 -#: ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/ultralcd.cpp:4153 msgid "FS Action" msgstr "FS aktion" @@ -624,36 +624,36 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5450 +#: ../../Firmware/ultralcd.cpp:5455 msgid "Fail stats" msgstr "Felstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5458 msgid "Fail stats MMU" msgstr "Felstatistik MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6880 msgid "False triggering" msgstr "Felaktig triggning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5584 -#: ../../Firmware/ultralcd.cpp:5735 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 +#: ../../Firmware/ultralcd.cpp:5740 msgid "Fan speed" msgstr "Fläktfart" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6984 -#: ../../Firmware/ultralcd.cpp:7138 ../../Firmware/ultralcd.cpp:7139 -#: ../../Firmware/ultralcd.cpp:7140 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 +#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 +#: ../../Firmware/ultralcd.cpp:7145 msgid "Fan test" msgstr "Fläkttest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:5604 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:5609 msgid "Fans check" msgstr "Fläktcheck" @@ -682,41 +682,41 @@ msgid "Feeding to nozzle" msgstr "Matar till munstycke" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1225 -#: ../../Firmware/ultralcd.cpp:1254 ../../Firmware/ultralcd.cpp:1308 -#: ../../Firmware/ultralcd.cpp:1310 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 +#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 +#: ../../Firmware/ultralcd.cpp:1315 msgid "Fil. runouts" msgstr "Fil. avbrott" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3353 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4595 -#: ../../Firmware/ultralcd.cpp:5595 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 +#: ../../Firmware/ultralcd.cpp:5600 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3686 +#: ../../Firmware/ultralcd.cpp:3691 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2283 -#: ../../Firmware/ultralcd.cpp:2287 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 +#: ../../Firmware/ultralcd.cpp:2292 msgid "Filament extruding & with correct color?" msgstr "Extruderas filament med rätt färg?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2222 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament not loaded" msgstr "Filament ej laddat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6870 -#: ../../Firmware/ultralcd.cpp:6874 ../../Firmware/ultralcd.cpp:6878 -#: ../../Firmware/ultralcd.cpp:7167 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 +#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 +#: ../../Firmware/ultralcd.cpp:7172 msgid "Filament sensor" msgstr "Filament sensor" @@ -748,42 +748,42 @@ msgstr "" "extruder.Kontrollera PFFE-slang och att sensorn läser korrekt." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2356 +#: ../../Firmware/ultralcd.cpp:2361 msgid "Filament used" msgstr "Använt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7297 +#: ../../Firmware/ultralcd.cpp:7302 msgid "File incomplete. Continue anyway?" msgstr "Filen är ofullständig. Fortsätta ändå?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5164 ../../Firmware/ultralcd.cpp:5491 +#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 msgid "Finishing movements" msgstr "Avslutar flyttning" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4713 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 +#: ../../Firmware/ultralcd.cpp:5282 msgid "First layer cal." msgstr "Förstalager kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3928 +#: ../../Firmware/ultralcd.cpp:3933 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Först kommer jag att utföra självtestet för att kontrollera de vanligaste " "monteringsproblemen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5585 +#: ../../Firmware/ultralcd.cpp:5590 msgid "Flow" msgstr "Flöde" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:980 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,18 +792,18 @@ msgstr "" " prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6840 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Front print fan?" msgstr "Frontfläkt?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2727 +#: ../../Firmware/ultralcd.cpp:2732 msgid "Front side[µm]" msgstr "Frontsida[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6869 msgid "Front/left fans" msgstr "Front/vänster fläkt" @@ -852,13 +852,13 @@ msgstr "" "Utskriften avbröts." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4497 -#: ../../Firmware/ultralcd.cpp:4514 ../../Firmware/ultralcd.cpp:4620 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 +#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 msgid "HW Setup" msgstr "HW inställning" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6817 msgid "Heater/Thermistor" msgstr "Värmare/Termistor" @@ -880,7 +880,7 @@ msgid "Heating done." msgstr "Uppvärmning klar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3888 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,7 +891,7 @@ msgstr "" "att skriva ut." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3892 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -900,9 +900,9 @@ msgstr "" "installationsprocessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5628 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5633 msgid "High power" msgstr "Hög kraft" @@ -913,23 +913,23 @@ msgid "Homing" msgstr "Flyttar till hempos" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1000 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend temperatur är 280C! Är munstycket bytt och spänt enligt specs?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7158 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7163 msgid "Hotend fan:" msgstr "Hotend-fläkt:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3938 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Jag kommer att utföra en xyz-kalibrering nu. Det tar upp till 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3949 msgid "I will run z calibration now." msgstr "Jag kommer att utföra z-kalibrering nu." @@ -954,7 +954,7 @@ msgid "INVALID TOOL" msgstr "OGILTIGT VERKTYG" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:4020 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -968,22 +968,22 @@ msgid "Improving bed calibration point" msgstr "Förbättrar bäddens kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5331 +#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 msgid "Info screen" msgstr "Infoskärm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5403 +#: ../../Firmware/ultralcd.cpp:5408 msgid "Init. SD card" msgstr "Init. SD-kort" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2158 +#: ../../Firmware/ultralcd.cpp:2163 msgid "Insert filament" msgstr "Sätt i filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6077 +#: ../../Firmware/ultralcd.cpp:6082 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +998,14 @@ msgid "" msgstr "Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3707 -#: ../../Firmware/ultralcd.cpp:3974 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 +#: ../../Firmware/ultralcd.cpp:3979 msgid "Is filament loaded?" msgstr "Är filament laddat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 #: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3940 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 msgid "Is steel sheet on heatbed?" msgstr "Ligger metallskiva på värmebädden?" @@ -1015,98 +1015,98 @@ msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1119 -#: ../../Firmware/ultralcd.cpp:1278 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Last print" msgstr "Senaste utskrift" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1143 -#: ../../Firmware/ultralcd.cpp:1252 ../../Firmware/ultralcd.cpp:1307 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 +#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 msgid "Last print failures" msgstr "Senaste utskriftsfel" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2487 +#: ../../Firmware/ultralcd.cpp:2492 msgid "Left" msgstr "Vänster" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6990 ../../Firmware/ultralcd.cpp:6995 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 +#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 msgid "Left hotend fan?" msgstr "Vänst hotend fläkt?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2725 +#: ../../Firmware/ultralcd.cpp:2730 msgid "Left side [µm]" msgstr "Vänstsida [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5710 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 msgid "Level Bright" msgstr "Ljusnivå" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5711 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 msgid "Level Dimmed" msgstr "Nivå dämpad" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/ultralcd.cpp:4631 msgid "Lin. correction" msgstr "Linjär korrektion" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4637 -#: ../../Firmware/ultralcd.cpp:5346 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 +#: ../../Firmware/ultralcd.cpp:5351 msgid "Live adjust Z" msgstr "Live justera Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4945 -#: ../../Firmware/ultralcd.cpp:5025 +#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 +#: ../../Firmware/ultralcd.cpp:5030 msgid "Load All" msgstr "Ladda alla" #. MSG_LOAD_FILAMENT c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4947 -#: ../../Firmware/ultralcd.cpp:4966 ../../Firmware/ultralcd.cpp:5027 -#: ../../Firmware/ultralcd.cpp:5420 ../../Firmware/ultralcd.cpp:5437 +#: ../../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 "Ladda filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5421 +#: ../../Firmware/ultralcd.cpp:5426 msgid "Load to nozzle" msgstr "Ladd till munstyck" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4308 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 msgid "Loading Test" msgstr "Laddningstest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2194 +#: ../../Firmware/ultralcd.cpp:2199 msgid "Loading color" msgstr "Laddar färg" #. MSG_LOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:326 ../../Firmware/ultralcd.cpp:2205 -#: ../../Firmware/ultralcd.cpp:3798 +#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 +#: ../../Firmware/ultralcd.cpp:3803 msgid "Loading filament" msgstr "Laddar filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6852 +#: ../../Firmware/ultralcd.cpp:6857 msgid "Loose pulley" msgstr "Lös pulley" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4335 msgid "Loud" msgstr "Högt" @@ -1121,8 +1121,8 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware internt fel, vänligen återställ MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4273 -#: ../../Firmware/ultralcd.cpp:4274 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 +#: ../../Firmware/ultralcd.cpp:4279 msgid "MMU Mode" msgstr "MMU-läge" @@ -1132,7 +1132,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARAR INTE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:330 +#: ../../Firmware/mmu2_reporting.cpp:343 msgid "MMU Retry: Restoring temperature..." msgstr "MMU försök igen: Återställer temperatur..." @@ -1143,14 +1143,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SJÄLVTEST FELADE" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1144 -#: ../../Firmware/ultralcd.cpp:1169 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 +#: ../../Firmware/ultralcd.cpp:1174 msgid "MMU fails" msgstr "MMU felar" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1145 -#: ../../Firmware/ultralcd.cpp:1170 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 +#: ../../Firmware/ultralcd.cpp:1175 msgid "MMU load fails" msgstr "MMU-laddn felar" @@ -1165,28 +1165,28 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarar inte. Kontrollera kablarna och kontakterna." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1658 +#: ../../Firmware/ultralcd.cpp:1663 msgid "MMU connected" msgstr "MMU ansluten" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 msgid "Magnets comp." msgstr "Magnets komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1118 -#: ../../Firmware/ultralcd.cpp:1277 ../../Firmware/ultralcd.cpp:1319 -#: ../../Firmware/ultralcd.cpp:1623 ../../Firmware/ultralcd.cpp:4584 -#: ../../Firmware/ultralcd.cpp:4707 ../../Firmware/ultralcd.cpp:4944 -#: ../../Firmware/ultralcd.cpp:4964 ../../Firmware/ultralcd.cpp:4982 -#: ../../Firmware/ultralcd.cpp:5000 ../../Firmware/ultralcd.cpp:5024 -#: ../../Firmware/ultralcd.cpp:5578 +#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 +#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 +#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 +#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 +#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 +#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 +#: ../../Firmware/ultralcd.cpp:5583 msgid "Main" msgstr "Huvudmeny" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2528 +#: ../../Firmware/ultralcd.cpp:2533 msgid "Measured skew" msgstr "Mätt skevhet" @@ -1197,36 +1197,36 @@ msgid "Measuring reference height of calibration point" msgstr "Mätning av referenshöjd för kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 msgid "Mesh" msgstr "Nätverk" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4623 -#: ../../Firmware/ultralcd.cpp:4725 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 +#: ../../Firmware/ultralcd.cpp:4730 msgid "Mesh Bed Leveling" msgstr "Bäddytsjustering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4230 ../../Firmware/ultralcd.cpp:4250 -#: ../../Firmware/ultralcd.cpp:4253 ../../Firmware/ultralcd.cpp:4256 -#: ../../Firmware/ultralcd.cpp:4259 ../../Firmware/ultralcd.cpp:5611 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5625 -#: ../../Firmware/ultralcd.cpp:5626 ../../Firmware/ultralcd.cpp:5627 -#: ../../Firmware/ultralcd.cpp:5628 ../../Firmware/ultralcd.cpp:5712 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 +#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 +#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 +#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3467 +#: ../../Firmware/ultralcd.cpp:3472 msgid "Mode change in progress..." msgstr "Lägesändring pågår..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4447 -#: ../../Firmware/ultralcd.cpp:4450 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 +#: ../../Firmware/ultralcd.cpp:4455 msgid "Model" msgstr "Modell" @@ -1247,28 +1247,28 @@ msgid "More details online." msgstr "Mera detaljer online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6826 -#: ../../Firmware/ultralcd.cpp:6835 ../../Firmware/ultralcd.cpp:6853 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3389 +#: ../../Firmware/ultralcd.cpp:3394 msgid "Move X" msgstr "Flytta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3390 +#: ../../Firmware/ultralcd.cpp:3395 msgid "Move Y" msgstr "Flytta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3391 +#: ../../Firmware/ultralcd.cpp:3396 msgid "Move Z" msgstr "Flytta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4590 +#: ../../Firmware/ultralcd.cpp:4595 msgid "Move axis" msgstr "Flytta axlar" @@ -1280,10 +1280,10 @@ msgstr "Flyttar väljare" #. MSG_NA c=3 #: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2493 ../../Firmware/ultralcd.cpp:2537 -#: ../../Firmware/ultralcd.cpp:3314 ../../Firmware/ultralcd.cpp:4129 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4132 -#: ../../Firmware/ultralcd.cpp:5684 +#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 +#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 +#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 +#: ../../Firmware/ultralcd.cpp:5689 msgid "N/A" msgstr "N/A" @@ -1293,14 +1293,14 @@ msgid "New firmware version available:" msgstr "Ny firmware vers tillgänglig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3061 -#: ../../Firmware/ultralcd.cpp:4574 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5869 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 +#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 +#: ../../Firmware/ultralcd.cpp:5874 msgid "No" msgstr "Nej" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5406 msgid "No SD card" msgstr "Inget SD-kort" @@ -1310,66 +1310,66 @@ msgid "No move." msgstr "Ingen rörelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4361 -#: ../../Firmware/ultralcd.cpp:4370 ../../Firmware/ultralcd.cpp:4441 -#: ../../Firmware/ultralcd.cpp:4450 ../../Firmware/ultralcd.cpp:4480 -#: ../../Firmware/ultralcd.cpp:4489 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 +#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 +#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 +#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4228 -#: ../../Firmware/ultralcd.cpp:4273 ../../Firmware/ultralcd.cpp:4647 -#: ../../Firmware/ultralcd.cpp:5611 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 +#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/ultralcd.cpp:5616 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6813 +#: ../../Firmware/ultralcd.cpp:6818 msgid "Not connected" msgstr "Inte ansluten" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7009 -#: ../../Firmware/ultralcd.cpp:7024 ../../Firmware/ultralcd.cpp:7032 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 +#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 msgid "Not spinning" msgstr "Roterar inte" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3808 +#: ../../Firmware/ultralcd.cpp:3813 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Nu ska jag kalibrera avståndet mellan munstyckets spets och värmebäddsytan." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3953 +#: ../../Firmware/ultralcd.cpp:3958 msgid "Now I will preheat nozzle for PLA." msgstr "Nu ska jag förvärma munstycket för PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3939 +#: ../../Firmware/ultralcd.cpp:3944 msgid "Now remove the test print from steel sheet." msgstr "Ta nu bort testutskriften från metallskivan." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1382 -#: ../../Firmware/ultralcd.cpp:4361 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4367 ../../Firmware/ultralcd.cpp:4370 -#: ../../Firmware/ultralcd.cpp:5581 ../../Firmware/ultralcd.cpp:5724 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 +#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 +#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 msgid "Nozzle" msgstr "Munstycke" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4554 -#: ../../Firmware/ultralcd.cpp:4621 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 +#: ../../Firmware/ultralcd.cpp:4626 msgid "Nozzle change" msgstr "Munstycksbyte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4407 -#: ../../Firmware/ultralcd.cpp:4409 ../../Firmware/ultralcd.cpp:4410 -#: ../../Firmware/ultralcd.cpp:4411 +#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 +#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 +#: ../../Firmware/ultralcd.cpp:4416 msgid "Nozzle d." msgstr "Munst dia." @@ -1381,15 +1381,15 @@ msgstr "OK" #. MSG_OFF c=3 #: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4125 -#: ../../Firmware/ultralcd.cpp:4136 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4139 ../../Firmware/ultralcd.cpp:4162 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4234 -#: ../../Firmware/ultralcd.cpp:4598 ../../Firmware/ultralcd.cpp:4613 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4633 -#: ../../Firmware/ultralcd.cpp:5505 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5615 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 +#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 +#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 +#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "Off" msgstr "Av" @@ -1401,19 +1401,19 @@ msgstr "" #. MSG_ON c=3 #: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4136 -#: ../../Firmware/ultralcd.cpp:4137 ../../Firmware/ultralcd.cpp:4139 -#: ../../Firmware/ultralcd.cpp:4162 ../../Firmware/ultralcd.cpp:4177 -#: ../../Firmware/ultralcd.cpp:4233 ../../Firmware/ultralcd.cpp:4598 -#: ../../Firmware/ultralcd.cpp:4613 ../../Firmware/ultralcd.cpp:4630 -#: ../../Firmware/ultralcd.cpp:4633 ../../Firmware/ultralcd.cpp:5604 -#: ../../Firmware/ultralcd.cpp:5613 ../../Firmware/ultralcd.cpp:5684 -#: ../../Firmware/ultralcd.cpp:7660 ../../Firmware/ultralcd.cpp:7664 +#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 +#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 +#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 +#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4321 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 msgid "Once" msgstr "En gång" @@ -1423,40 +1423,40 @@ msgid "PAUSED THERMAL ERROR" msgstr "PAUSAT TERMISKT FEL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:904 +#: ../../Firmware/ultralcd.cpp:909 msgid "PID cal." msgstr "PID kalibrering." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:914 msgid "PID cal. finished" msgstr "PID kalibrering klar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/ultralcd.cpp:4733 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:605 +#: ../../Firmware/ultralcd.cpp:610 msgid "PINDA Heating" msgstr "PINDA uppvärmning" #. MSG_PINDA_CALIBRATION c=13 #: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:602 -#: ../../Firmware/ultralcd.cpp:4630 ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 +#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3267 +#: ../../Firmware/ultralcd.cpp:3272 msgid "PINDA calibration failed" msgstr "PINDA-kalibrering misslyckades" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 #: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3261 +#: ../../Firmware/ultralcd.cpp:3266 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1476,13 +1476,13 @@ msgid "Parking selector" msgstr "Parkerar väljare" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4148 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 msgid "Pause" msgstr "Paus" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5360 -#: ../../Firmware/ultralcd.cpp:5362 +#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 +#: ../../Firmware/ultralcd.cpp:5367 msgid "Pause print" msgstr "Pausa utskrift" @@ -1502,7 +1502,7 @@ msgstr "" "punkterna. Om munstycket fångar papperet, stäng av omedelbart." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4047 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1511,17 +1511,17 @@ msgstr "" "starta om skrivaren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6102 +#: ../../Firmware/ultralcd.cpp:6107 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Kontrollera IR-sensorns anslutning, mata ut eventuellt filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6807 +#: ../../Firmware/ultralcd.cpp:6812 msgid "Please check:" msgstr "Kontrollera:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4010 +#: ../../Firmware/ultralcd.cpp:4015 msgid "Please clean heatbed and then press the knob." msgstr "Rengör bädden och tryck sedan på knappen." @@ -1531,7 +1531,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengör munstycket för kalibrering. Klicka när du är klar." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3795 +#: ../../Firmware/ultralcd.cpp:3800 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1539,7 +1539,7 @@ msgstr "" "inladdning.." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3789 +#: ../../Firmware/ultralcd.cpp:3794 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1548,7 +1548,7 @@ msgstr "" "knappen för inladdning." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3715 +#: ../../Firmware/ultralcd.cpp:3720 msgid "Please load filament first." msgstr "Vänligen ladda filament först." @@ -1559,7 +1559,7 @@ msgstr "Öppna idler och ta bort filamentet manuellt." #. MSG_PLACE_STEEL_SHEET c=20 r=4 #: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3942 +#: ../../Firmware/ultralcd.cpp:3947 msgid "Please place steel sheet on heatbed." msgstr "Placera metallskiva på värmebädden." @@ -1570,12 +1570,12 @@ msgid "Please press the knob to unload filament" msgstr "Vänligen tryck på knappen för att mata ut filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5062 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 msgid "Please pull out filament immediately" msgstr "Vänligen ta ut filamentet omedelbart" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3943 msgid "Please remove shipping helpers first." msgstr "Vänligen ta bort fraktinsatserna först." @@ -1591,7 +1591,7 @@ msgid "Please run XYZ calibration first." msgstr "Utför XYZ-kalibrering först." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6099 +#: ../../Firmware/ultralcd.cpp:6104 msgid "Please unload the filament first, then repeat this action." msgstr "Vänligen mata ut filamentet först och upprepa sedan denna åtgärd." @@ -1603,49 +1603,49 @@ msgstr "Vänligen uppgradera." #. MSG_PLEASE_WAIT c=20 #: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 #: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2195 ../../Firmware/ultralcd.cpp:2206 +#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 msgid "Please wait" msgstr "Vänligen vänta" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1224 -#: ../../Firmware/ultralcd.cpp:1253 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 +#: ../../Firmware/ultralcd.cpp:1258 msgid "Power failures" msgstr "Strömavbrott" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5355 +#: ../../Firmware/ultralcd.cpp:5360 msgid "Preheat" msgstr "Förvärm" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2276 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 msgid "Preheat the nozzle!" msgstr "Förvärm munstycket!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2789 -#: ../../Firmware/ultralcd.cpp:3774 ../../Firmware/ultralcd.cpp:3776 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 +#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 msgid "Preheating nozzle. Please wait." msgstr "Förvärmer munstycke. Vänta." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1992 +#: ../../Firmware/ultralcd.cpp:1997 msgid "Preheating to cut" msgstr "Förvärmer för skära" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1989 +#: ../../Firmware/ultralcd.cpp:1994 msgid "Preheating to eject" msgstr "Förvämer för utmatn" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1980 +#: ../../Firmware/ultralcd.cpp:1985 msgid "Preheating to load" msgstr "Förvärmer för laddn" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1990 msgid "Preheating to unload" msgstr "Förvärmer for utmatn" @@ -1656,7 +1656,7 @@ msgid "Preparing blade" msgstr "Förbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1806 +#: ../../Firmware/ultralcd.cpp:1811 msgid "Press the knob" msgstr "Tryck på knappen" @@ -1666,33 +1666,33 @@ msgid "Press the knob to preheat nozzle and continue." msgstr "Tryck på knappen för att förvärma munstycket och fortsätta." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:802 +#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 msgid "Print aborted" msgstr "Utskriften avbröts" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1097 -#: ../../Firmware/ultralcd.cpp:7161 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 +#: ../../Firmware/ultralcd.cpp:7166 msgid "Print fan:" msgstr "Utskriftsfläkt:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5393 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 msgid "Print from SD" msgstr "Skriv ut från SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:816 +#: ../../Firmware/ultralcd.cpp:821 msgid "Print paused" msgstr "Utskriften pausad" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2357 +#: ../../Firmware/ultralcd.cpp:2362 msgid "Print time" msgstr "Utskriftstid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1690 +#: ../../Firmware/ultralcd.cpp:1695 msgid "Printer IP Addr:" msgstr "Skrivarens IP adr:" @@ -1738,12 +1738,12 @@ msgid "QUEUE FULL" msgstr "KÖ FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4633 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2728 +#: ../../Firmware/ultralcd.cpp:2733 msgid "Rear side [µm]" msgstr "Baksida [µm]" @@ -1758,7 +1758,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5279 +#: ../../Firmware/ultralcd.cpp:5284 msgid "Rename" msgstr "Döp om" @@ -1772,24 +1772,24 @@ msgstr "" "G-codeen för verktygsindex utanför intervallet (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:5280 +#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 +#: ../../Firmware/ultralcd.cpp:5285 msgid "Reset" msgstr "Återställ" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4737 msgid "Reset XYZ calibr." msgstr "Återställ XYZ-kal." #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5374 ../../Firmware/ultralcd.cpp:5376 +#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 msgid "Resume print" msgstr "Återuppta utskrift" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:613 +#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 msgid "Resuming print" msgstr "Återupptar utskrift" @@ -1811,17 +1811,17 @@ msgid "Returning selector" msgstr "Återvändande väljare" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:2493 msgid "Right" msgstr "Höger" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2726 +#: ../../Firmware/ultralcd.cpp:2731 msgid "Right side[µm]" msgstr "Höger sida[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3738 +#: ../../Firmware/ultralcd.cpp:3743 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1830,8 +1830,8 @@ msgstr "" "börja om från början. Fortsätta?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4645 -#: ../../Firmware/ultralcd.cpp:4647 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/ultralcd.cpp:4652 msgid "SD card" msgstr "SD-kort" @@ -1857,12 +1857,12 @@ msgid "Searching bed calibration point" msgstr "Söker efter kalibreringspunkt för bädden" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5272 +#: ../../Firmware/ultralcd.cpp:5277 msgid "Select" msgstr "Välj" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3812 +#: ../../Firmware/ultralcd.cpp:3817 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1872,23 +1872,23 @@ msgstr "" #. MSG_SELECT_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 #: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3685 +#: ../../Firmware/ultralcd.cpp:3690 msgid "Select filament:" msgstr "Välj filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3530 -#: ../../Firmware/ultralcd.cpp:4640 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 +#: ../../Firmware/ultralcd.cpp:4645 msgid "Select language" msgstr "Välj språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3984 +#: ../../Firmware/ultralcd.cpp:3989 msgid "Select nozzle preheat temperature which matches your material." msgstr "Välj munstycksförvärmningstemperatur som passar ditt material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3822 msgid "Select temperature which matches your material." msgstr "Välj temperatur som passar ditt material." @@ -1899,28 +1899,28 @@ msgid "Selecting fil. slot" msgstr "Välj fil. spår" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6367 +#: ../../Firmware/ultralcd.cpp:6372 msgid "Self test OK" msgstr "Självtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6139 +#: ../../Firmware/ultralcd.cpp:6144 msgid "Self test start" msgstr "Självteststart" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4719 +#: ../../Firmware/ultralcd.cpp:4724 msgid "Selftest" msgstr "Självtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6806 +#: ../../Firmware/ultralcd.cpp:6811 msgid "Selftest error!" msgstr "Självtestfel!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6372 -#: ../../Firmware/ultralcd.cpp:6893 ../../Firmware/ultralcd.cpp:7151 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 +#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 msgid "Selftest failed" msgstr "Självtestet felade" @@ -1931,30 +1931,30 @@ msgstr "" "Självtest kommer att utföras för att kalibrera exakt sensorlös hemposition." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1702 +#: ../../Firmware/ultralcd.cpp:1707 msgid "Sensor info" msgstr "Sensorinfo" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6106 +#: ../../Firmware/ultralcd.cpp:6111 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifierad, ta bort filamentet nu." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2746 +#: ../../Firmware/ultralcd.cpp:2751 msgid "Set temperature:" msgstr "Sätt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3388 -#: ../../Firmware/ultralcd.cpp:3547 ../../Firmware/ultralcd.cpp:4068 -#: ../../Firmware/ultralcd.cpp:5441 ../../Firmware/ultralcd.cpp:5675 -#: ../../Firmware/ultralcd.cpp:5722 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 +#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 +#: ../../Firmware/ultralcd.cpp:5727 msgid "Settings" msgstr "Inställningar" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2531 +#: ../../Firmware/ultralcd.cpp:2536 msgid "Severe skew" msgstr "Hög skevhet" @@ -1965,7 +1965,7 @@ msgid "Sheet" msgstr "Skiva" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3675 +#: ../../Firmware/ultralcd.cpp:3680 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1978,18 +1978,18 @@ msgstr "" "%cÅterställ" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/ultralcd.cpp:4735 msgid "Show end stops" msgstr "Visa ändlägen" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4253 -#: ../../Firmware/ultralcd.cpp:4324 ../../Firmware/ultralcd.cpp:5626 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 +#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 msgid "Silent" msgstr "Tyst" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2530 +#: ../../Firmware/ultralcd.cpp:2535 msgid "Slight skew" msgstr "Låg skevhet" @@ -2008,8 +2008,8 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Ett problem har uppstått, Z-nivellering utförs..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4651 ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 msgid "Sort" msgstr "Sortera" @@ -2020,20 +2020,20 @@ msgid "Sorting files" msgstr "Sorterar filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4318 -#: ../../Firmware/ultralcd.cpp:4321 ../../Firmware/ultralcd.cpp:4324 -#: ../../Firmware/ultralcd.cpp:4327 ../../Firmware/ultralcd.cpp:4330 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 +#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 +#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 msgid "Sound" msgstr "Ljud" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5579 +#: ../../Firmware/ultralcd.cpp:5584 msgid "Speed" msgstr "Fart" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7007 -#: ../../Firmware/ultralcd.cpp:7022 ../../Firmware/ultralcd.cpp:7030 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 +#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 msgid "Spinning" msgstr "Rotation" @@ -2043,19 +2043,19 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil omgivningstemperatur 21-26C krävs samt ett styvt stativ." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5446 +#: ../../Firmware/ultralcd.cpp:5451 msgid "Statistics" msgstr "Statistik" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4230 -#: ../../Firmware/ultralcd.cpp:4274 ../../Firmware/ultralcd.cpp:5618 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 +#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 msgid "Stealth" msgstr "Tyst" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4552 -#: ../../Firmware/ultralcd.cpp:5269 +#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 +#: ../../Firmware/ultralcd.cpp:5274 msgid "Steel sheets" msgstr "Metallskivor" @@ -2065,24 +2065,24 @@ msgid "Stop" msgstr "Stopp" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5381 -#: ../../Firmware/ultralcd.cpp:5861 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 +#: ../../Firmware/ultralcd.cpp:5866 msgid "Stop print" msgstr "Stoppa utskriften" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4367 -#: ../../Firmware/ultralcd.cpp:4447 ../../Firmware/ultralcd.cpp:4486 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 +#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5460 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6865 +#: ../../Firmware/ultralcd.cpp:6870 msgid "Swapped" msgstr "Utbytt" @@ -2122,7 +2122,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERSPÄNNINGFEL" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3965 +#: ../../Firmware/ultralcd.cpp:3970 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2136,17 +2136,17 @@ msgid "Thermal model not calibrated yet." msgstr "Termisk-modellen är inte kalibrerad ännu." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4586 +#: ../../Firmware/ultralcd.cpp:4591 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1708 +#: ../../Firmware/ultralcd.cpp:1713 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:322 +#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 msgid "Testing filament" msgstr "Testar filament" @@ -2167,7 +2167,7 @@ msgstr "" "blockerar dess rörelse." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3820 +#: ../../Firmware/ultralcd.cpp:3825 msgid "" "The printer will start printing a zig-zag line. Rotate the knob until you " "reach the optimal height. Check the pictures in the handbook (Calibration " @@ -2186,39 +2186,39 @@ msgstr "" "kap Första stegen, avs Kalibreringsflöde." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4650 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 msgid "Time" msgstr "Tid" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5713 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1120 -#: ../../Firmware/ultralcd.cpp:1279 +#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 +#: ../../Firmware/ultralcd.cpp:1284 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1168 -#: ../../Firmware/ultralcd.cpp:1223 ../../Firmware/ultralcd.cpp:1309 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 +#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 msgid "Total failures" msgstr "Totala fel" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2378 +#: ../../Firmware/ultralcd.cpp:2383 msgid "Total filament" msgstr "Total filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2379 +#: ../../Firmware/ultralcd.cpp:2384 msgid "Total print time" msgstr "Tot utskriftstid" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5353 +#: ../../Firmware/ultralcd.cpp:5358 msgid "Tune" msgstr "Ställ in" @@ -2233,15 +2233,15 @@ msgid "Unload" msgstr "Ladda ur" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5422 -#: ../../Firmware/ultralcd.cpp:5439 +#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 +#: ../../Firmware/ultralcd.cpp:5444 msgid "Unload filament" msgstr "Ta bort filament" #. MSG_UNLOADING_FILAMENT c=20 #: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5040 +#: ../../Firmware/ultralcd.cpp:5045 msgid "Unloading filament" msgstr "Tar bort filament" @@ -2258,12 +2258,12 @@ msgid "Unloading to pulley" msgstr "Ladd ur t. remskiva" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6109 +#: ../../Firmware/ultralcd.cpp:6114 msgid "Verification failed, remove the filament and try again." msgstr "Verifieringen felade, ta bort filamentet, försök igen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1711 +#: ../../Firmware/ultralcd.cpp:1716 msgid "Voltages" msgstr "Spänning" @@ -2274,7 +2274,7 @@ msgid "WARNING TMC TOO HOT" msgstr "VARNING TMC FÖR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3431 +#: ../../Firmware/ultralcd.cpp:3436 msgid "" "WARNING:\n" "Crash detection\n" @@ -2292,18 +2292,18 @@ msgid "Wait for user..." msgstr "Väntar på användare." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2770 +#: ../../Firmware/ultralcd.cpp:2775 msgid "Waiting for PINDA probe cooling" msgstr "Väntar på PINDA-sondens kylning" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2802 +#: ../../Firmware/ultralcd.cpp:2807 msgid "Waiting for nozzle and bed cooling" msgstr "Väntar på munstycks- och bäddkylning" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4364 -#: ../../Firmware/ultralcd.cpp:4444 ../../Firmware/ultralcd.cpp:4483 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 +#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 msgid "Warn" msgstr "Varna" @@ -2328,134 +2328,134 @@ msgid "Was filament unload successful?" msgstr "Lyckades filamentutmatningen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6817 -#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6841 -#: ../../Firmware/ultralcd.cpp:6847 ../../Firmware/ultralcd.cpp:6871 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 +#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 msgid "Wiring error" msgstr "Kabelfel" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4710 +#: ../../Firmware/ultralcd.cpp:4715 msgid "Wizard" msgstr "Guide" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4072 +#: ../../Firmware/ultralcd.cpp:4077 msgid "X-correct:" msgstr "X-korrektion:" #. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5457 +#: ../../Firmware/ultralcd.cpp:5462 msgid "XFLASH init" msgstr "XFLASH init" #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1700 +#: ../../Firmware/ultralcd.cpp:1705 msgid "XYZ cal. details" msgstr "XYZ kal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3239 +#: ../../Firmware/ultralcd.cpp:3244 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ-kalibrering ok. Skevhet kommer att korrigeras automatiskt." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3236 +#: ../../Firmware/ultralcd.cpp:3241 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibrering ok. X/Y-axlarna är mycket lite skeva. Bra jobbat!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3217 +#: ../../Firmware/ultralcd.cpp:3222 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibrering komprometterad. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3220 +#: ../../Firmware/ultralcd.cpp:3225 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibrering komprometterad. Främre hö kalibreringspunkter kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3199 +#: ../../Firmware/ultralcd.cpp:3204 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibrering felade. Kalibreringspunkter ej funna." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3205 +#: ../../Firmware/ultralcd.cpp:3210 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibrering felade. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3202 -#: ../../Firmware/ultralcd.cpp:3230 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 +#: ../../Firmware/ultralcd.cpp:3235 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibrering felade. Se bruksanvisningen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3208 +#: ../../Firmware/ultralcd.cpp:3213 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibrering felade. Höger främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3233 +#: ../../Firmware/ultralcd.cpp:3238 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibrering ok. X/Y-axlarna ar vinkelräta. Grattis!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2485 +#: ../../Firmware/ultralcd.cpp:2490 msgid "Y distance from min" msgstr "Y avstånd från min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4073 +#: ../../Firmware/ultralcd.cpp:4078 msgid "Y-correct:" msgstr "Y-korrekt:" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2221 -#: ../../Firmware/ultralcd.cpp:3061 ../../Firmware/ultralcd.cpp:4574 -#: ../../Firmware/ultralcd.cpp:4667 ../../Firmware/ultralcd.cpp:5870 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 +#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 +#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4034 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid återuppta guiden från Kalibrering -> Guide." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4074 +#: ../../Firmware/ultralcd.cpp:4079 msgid "Z-correct:" msgstr "Z-korrekt:" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5683 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 msgid "Z-probe nr." msgstr "Z-sond nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2555 +#: ../../Firmware/ultralcd.cpp:2560 msgid "[0;0] point offset" msgstr "[0;0] punktförskjutn" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2168 msgid "and press the knob" msgstr "och tryck på knapp" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1814 +#: ../../Firmware/ultralcd.cpp:1819 msgid "to load filament" msgstr "att ladda filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1818 +#: ../../Firmware/ultralcd.cpp:1823 msgid "to unload filament" msgstr "att ta bort filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1667 +#: ../../Firmware/ultralcd.cpp:1672 msgid "unknown" msgstr "okänd" @@ -2465,13 +2465,13 @@ msgid "unknown state" msgstr "okänt stat" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5938 -#: ../../Firmware/ultralcd.cpp:5941 +#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 +#: ../../Firmware/ultralcd.cpp:5946 msgid "🔃Refresh" msgstr "🔃Uppdatera" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1171 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 msgid "MMU power fails" msgstr "MMU strömavbr." @@ -2509,8 +2509,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERSPÄNN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1121 -#: ../../Firmware/ultralcd.cpp:1195 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 +#: ../../Firmware/ultralcd.cpp:1200 msgid "Material changes" msgstr "Materialutbyten" From e87e1630e24bc12396cc103d0a97d39f8d0e6a0a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 09:09:38 +0100 Subject: [PATCH 045/240] Bump up version t3.13.0-BETA1 commit nr 6508 +46 commits between +1 commit for this PR +1 commit for the merge =6556 --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 4e8c4dd43..e82b43b52 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -17,7 +17,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_MAJOR 3 #define FW_MINOR 13 #define FW_REVISION 0 -#define FW_FLAVOR BETA //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC +#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC #define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8. #ifndef FW_FLAVOR #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) @@ -25,7 +25,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6508 +#define FW_COMMIT_NR 6556 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. From 731ea14bd89da15ea7c4a2f15b0676472da08bd4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 11:21:46 +0100 Subject: [PATCH 046/240] Fix Swedish translation Thanks to @jmd73 --- lang/po/Firmware_sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 037175170..ebe83c7f2 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -580,7 +580,7 @@ msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" -"FINDA stängdes inte av när filamentet ladddades ur. Försök att ladda ur " +"FINDA stängdes inte av när filamentet laddades ur. Försök att ladda ur " "manuellt. Se till att filamentet kan röra sig och att FINDA fungerar." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 @@ -726,8 +726,8 @@ msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" -"Filamentsensorn triggades inte av när filamentet ladddades ur.Se till att " -"filamentet kan röra sig och att sensornfungerar." +"Filamentsensorn triggades inte av när filamentet laddades ur.Se till att " +"filamentet kan röra sig och att sensorn fungerar." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 @@ -735,7 +735,7 @@ msgid "" "Filament sensor didn't trigger while loading the filament. Ensure the " "filament reached the fsensor and the sensor works." msgstr "" -"Filamentsensorn triggades inte av när filamentet ladddades in.Se till att " +"Filamentsensorn triggades inte av när filamentet laddades in.Se till att " "filamentet kan röra sig och att sensorn fungerar." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 From 68b4a8a6cbefa543f790bab7dd4186049538a5cd Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 11:22:43 +0100 Subject: [PATCH 047/240] Last minute changes need a revert of the fw bump up --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index e82b43b52..4e8c4dd43 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -17,7 +17,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_MAJOR 3 #define FW_MINOR 13 #define FW_REVISION 0 -#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC +#define FW_FLAVOR BETA //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC #define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8. #ifndef FW_FLAVOR #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) @@ -25,7 +25,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6556 +#define FW_COMMIT_NR 6508 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. From b837c11840b6e9160ab81487e3848b0734138aeb Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 14 Mar 2023 09:43:40 +0100 Subject: [PATCH 048/240] Disable reading MMU register 0x21 It has proven to be too unreliable and may confuse end users. --- Firmware/mmu2_protocol_logic.cpp | 1 - Firmware/mmu2_protocol_logic.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 58f34a31d..9c91776a0 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -35,7 +35,6 @@ const uint8_t ProtocolLogic::regs8Addrs[ProtocolLogic::regs8Count] PROGMEM = { const uint8_t ProtocolLogic::regs16Addrs[ProtocolLogic::regs16Count] PROGMEM = { 4, // MMU errors - aka statistics 0x1a, // Pulley position [mm] - 0x21, // MCU bandgap voltage }; const uint8_t ProtocolLogic::initRegs8Addrs[ProtocolLogic::initRegs8Count] PROGMEM = { diff --git a/Firmware/mmu2_protocol_logic.h b/Firmware/mmu2_protocol_logic.h index b7128806b..53ec0002a 100644 --- a/Firmware/mmu2_protocol_logic.h +++ b/Firmware/mmu2_protocol_logic.h @@ -365,10 +365,10 @@ private: uint8_t regs8[regs8Count] = { 0, 0, 0 }; // 16bit registers - static constexpr uint8_t regs16Count = 3; + static constexpr uint8_t regs16Count = 2; static_assert(regs16Count > 0); // code is not ready for empty lists of registers static const uint8_t regs16Addrs[regs16Count] PROGMEM; - uint16_t regs16[regs16Count] = { 0, 0, 0 }; + uint16_t regs16[regs16Count] = { 0, 0 }; // 8bit init values to be sent to the MMU after line up static constexpr uint8_t initRegs8Count = 2; From 3fe2f25c9f421b8a111d99f8dfeba7eb62b79de8 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 14 Mar 2023 09:43:40 +0100 Subject: [PATCH 049/240] Disable reading MMU register 0x21 It has proven to be too unreliable and may confuse end users. --- Firmware/mmu2_protocol_logic.cpp | 1 - Firmware/mmu2_protocol_logic.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index f64c9a99b..441cdec1e 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -35,7 +35,6 @@ const uint8_t ProtocolLogic::regs8Addrs[ProtocolLogic::regs8Count] PROGMEM = { const uint8_t ProtocolLogic::regs16Addrs[ProtocolLogic::regs16Count] PROGMEM = { 4, // MMU errors - aka statistics 0x1a, // Pulley position [mm] - 0x21, // MCU bandgap voltage }; const uint8_t ProtocolLogic::initRegs8Addrs[ProtocolLogic::initRegs8Count] PROGMEM = { diff --git a/Firmware/mmu2_protocol_logic.h b/Firmware/mmu2_protocol_logic.h index b7128806b..53ec0002a 100644 --- a/Firmware/mmu2_protocol_logic.h +++ b/Firmware/mmu2_protocol_logic.h @@ -365,10 +365,10 @@ private: uint8_t regs8[regs8Count] = { 0, 0, 0 }; // 16bit registers - static constexpr uint8_t regs16Count = 3; + static constexpr uint8_t regs16Count = 2; static_assert(regs16Count > 0); // code is not ready for empty lists of registers static const uint8_t regs16Addrs[regs16Count] PROGMEM; - uint16_t regs16[regs16Count] = { 0, 0, 0 }; + uint16_t regs16[regs16Count] = { 0, 0 }; // 8bit init values to be sent to the MMU after line up static constexpr uint8_t initRegs8Count = 2; From 00309f42c305ff3a6602543d99f396d2a2f202fa Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 14 Mar 2023 15:18:13 +0100 Subject: [PATCH 050/240] Bump up fw version 6508 from t3.13.0-BETA1 +50 commits +1 for this commit +1 for merge --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 4e8c4dd43..0f47d4b50 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -17,7 +17,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_MAJOR 3 #define FW_MINOR 13 #define FW_REVISION 0 -#define FW_FLAVOR BETA //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC +#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, ALPHA, BETA or RC #define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8. #ifndef FW_FLAVOR #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) @@ -25,7 +25,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6508 +#define FW_COMMIT_NR 6560 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. From 8b49d241d2a4fcb424bbd7ed696df8ba2d1775d5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 15 Mar 2023 07:03:41 +0100 Subject: [PATCH 051/240] revert BTN_MORE non-translated --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_error_converter.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- lang/po/Firmware.pot | 6 ++++++ lang/po/Firmware_cs.po | 7 +++++-- lang/po/Firmware_de.po | 7 +++++-- lang/po/Firmware_es.po | 7 +++++-- lang/po/Firmware_fr.po | 7 +++++-- lang/po/Firmware_hr.po | 7 +++++-- lang/po/Firmware_hu.po | 7 +++++-- lang/po/Firmware_it.po | 7 +++++-- lang/po/Firmware_nl.po | 7 +++++-- lang/po/Firmware_no.po | 7 +++++-- lang/po/Firmware_pl.po | 7 +++++-- lang/po/Firmware_ro.po | 7 +++++-- lang/po/Firmware_sk.po | 7 +++++-- lang/po/Firmware_sv.po | 7 +++++-- 17 files changed, 74 insertions(+), 29 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 44a205666..d88819feb 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -332,7 +332,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("RstMMU"); ////MSG_BTN static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 -static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; +static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8 // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 0f9975026..3673f7d90 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){ } const char * PrusaErrorButtonMore(){ - return MSG_BTN_MORE; + return _R(MSG_BTN_MORE); } struct ResetOnExit { diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 2fe63f46b..e2d537939 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -77,7 +77,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // Render the choices - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : PrusaErrorButtonMore()); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); } void ReportErrorHookSensorLineRender(){ diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index f43412179..2d7397aba 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -2430,6 +2430,12 @@ msgstr "" msgid "unknown state" msgstr "" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "" + #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 #: ../../Firmware/ultralcd.cpp:5946 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 0217f23e4..b1bb2acdd 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2530,8 +2530,11 @@ msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 49199a45f..20d051d30 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2558,8 +2558,11 @@ msgstr "" "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Update auf Version 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 579d2744d..4cf573a06 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2554,8 +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." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index d09346508..5d07bd843 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2568,8 +2568,11 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 6953b096d..06c1a473c 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2547,8 +2547,11 @@ msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index a9a99e0c9..b167556ef 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2551,8 +2551,11 @@ msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " "2.1.9-es verzióra." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 6dcc4f8d8..c3ea06a54 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2552,8 +2552,11 @@ msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index b2fa0cc28..d10c04a6e 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2556,8 +2556,11 @@ msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 3e867fd1f..c22c4144f 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2529,8 +2529,11 @@ msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 739c65593..aa0ffbd91 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2548,8 +2548,11 @@ msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 6f5816339..2dacda832 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2552,8 +2552,11 @@ msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 2662a27c1..12c26c5fb 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2535,8 +2535,11 @@ msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index ebe83c7f2..10a81b9fd 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2542,8 +2542,11 @@ msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." -#~ msgid "⏬" -#~ msgstr "⏬" +#. MSG_BTN_MORE c=8 +#: ../../Firmware/mmu2/errors_list.h:335 +#: ../../Firmware/mmu2_error_converter.cpp:175 +msgid "⏬" +msgstr "⏬" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From c3235386a13a75b9144b610ee42ccca7cb010350 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 15 Mar 2023 07:52:01 +0100 Subject: [PATCH 052/240] Bump up commit number --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 0f47d4b50..721ace4ae 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -25,7 +25,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6560 +#define FW_COMMIT_NR 6565 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. From 5c010a3aaa393320e75382e15f2692275d21ea1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 10:43:23 +0000 Subject: [PATCH 053/240] PFW-1509 Fix an issue with unload when nozzle is cold Change in memory: Flash: -2 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f327fbdc1..b7b5fe6b9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1893,7 +1893,9 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_timeoutToStatus.stop(); - if (abs((int)current_temperature[0] - nTemp) > TEMP_HYSTERESIS) + // the current temperature is within +-TEMP_HYSTERESIS of the target + // then continue with the filament action if any is set + if (abs((int)current_temperature[0] - nTemp) < TEMP_HYSTERESIS) { switch (eFilamentAction) { @@ -1956,7 +1958,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); bFilamentWaitingFlag = false; } - else + else // still preheating, continue updating LCD UI { if (!bFilamentWaitingFlag || lcd_draw_update) { From bc2366cd8d267b2cd04c64e85a85214e33b13951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 4 Mar 2023 15:25:06 +0000 Subject: [PATCH 054/240] PFW-1503 Improve live Z babystep menu handling Fixes an issue with running first layer calibration twice in a row. Improvements: Now the Z baby step menu closes automatically when first layer calibration is done. No need to wait for a timeout or close the menu manually by setting a variable If the baby stepping menu is open, and suddenly the printer enters a state where baby stepping is not allowed. The printer will save the last value before closing the menu. When LcdCommands != Idle, don't dismiss the Z baby step menu. This saves 20B Change in memory: Flash: -130 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 7 +++++++ Firmware/Marlin_main.cpp | 7 +++++++ Firmware/ultralcd.cpp | 25 ++++++++----------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index ac55a7874..b7e0d6f8e 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -365,6 +365,13 @@ extern bool printer_active(); //! I'd normally change this macro, but who knows what would happen in the MMU :) bool check_fsensor(); +//! Condition where Babystepping is allowed: +//! 1) Axis are trusted: Z-axis position must be known +//! 2) Not allowed during Homing (printer busy) +//! 3) Not allowed during Mesh Bed Leveling (printer busy) +//! 4) Allowed if there are queued blocks OR there is a print job running +bool BABYSTEP_ALLOWED(); + extern void calculate_extruder_multipliers(); // Similar to the default Arduino delay function, diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b82105d90..4080a4af5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -545,6 +545,13 @@ bool check_fsensor() { && e_active(); } +bool __attribute__((noinline)) BABYSTEP_ALLOWED() { + return (axis_known_position[Z_AXIS] + && !homing_flag && !mesh_bed_leveling_flag + && ( blocks_queued() || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) + ); +} + bool fans_check_enabled = true; #ifdef TMC2130 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f327fbdc1..0892fd1eb 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -833,8 +833,6 @@ void lcd_commands() const float extrusion_width = (nozzle_dia + 20)/1000.0f; const float layer_height = 0.2f; - if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen - if (!blocks_queued() && cmd_buffer_empty() && !saved_printing) { if (lcd_commands_step == 0) @@ -879,7 +877,6 @@ void lcd_commands() break; case 2: lay1cal_finish(MMU2::mmu2.Enabled()); - menu_leaving = 1; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen break; case 1: lcd_setstatuspgm(MSG_WELCOME); @@ -2593,13 +2590,6 @@ static void lcd_move_z() { */ static void lcd_babystep_z() { - if (homing_flag || mesh_bed_leveling_flag) - { - // printer changed to a new state where live Z is forbidden - menu_back(); - return; - } - typedef struct { int8_t status; @@ -4638,7 +4628,7 @@ static void lcd_settings_menu() MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); #endif //HAS_SECOND_SERIAL - if (!isPrintPaused && !homing_flag && !mesh_bed_leveling_flag) + if ( BABYSTEP_ALLOWED() ) MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); #if (LANG_MODE != 0) @@ -5347,7 +5337,7 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(PSTR("power panic"), uvlo_); #endif //TMC2130_DEBUG - if ( ( IS_SD_PRINTING || usb_timer.running() || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { + if ( BABYSTEP_ALLOWED() ) { MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 } @@ -7467,13 +7457,11 @@ void menu_lcd_longpress_func(void) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // The lists are not the same for both functions, so first decide which function is to be performed - if ( (moves_planned() || IS_SD_PRINTING || usb_timer.running() )){ // long press as live-adj-z - if (( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height - && ( menu_menu == lcd_status_screen // and in listed menus... + if (BABYSTEP_ALLOWED()){ // long press as live-adj-z + if ( menu_menu == lcd_status_screen // and in listed menus... || menu_menu == lcd_main_menu || menu_menu == lcd_tune_menu || menu_menu == lcd_support_menu - ) ){ lcd_clear(); menu_submenu(lcd_babystep_z); @@ -7499,10 +7487,13 @@ void menu_lcd_longpress_func(void) } } +// Note: When lcd_commands_type is not LcdCommands::Idle +// we should ignore lcd_timeoutToStatus. Example use case is +// when running first layer calibration. static inline bool z_menu_expired() { return (menu_menu == lcd_babystep_z - && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z)); + && (!BABYSTEP_ALLOWED() || (lcd_commands_type == LcdCommands::Idle && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z)))); } static inline bool other_menu_expired() { From bb614f669d7bf9fc82d68862eb3fba5729c2d762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 4 Mar 2023 16:35:40 +0000 Subject: [PATCH 055/240] PFW-1503 Add additional check Add lcd_commands_type == LcdCommands::Layer1Cal just in case blocks_queued() is 0 for one instant between lcd_command steps Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4080a4af5..06b371b98 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -548,7 +548,7 @@ bool check_fsensor() { bool __attribute__((noinline)) BABYSTEP_ALLOWED() { return (axis_known_position[Z_AXIS] && !homing_flag && !mesh_bed_leveling_flag - && ( blocks_queued() || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) + && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) ); } From 09d918ce5d88bb1b79b0aaa8021a9cea1130290d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 09:40:04 +0000 Subject: [PATCH 056/240] PFW-1503 Change BABYSTEP_ALLOWED to babystep_allowed I initially started with a preprocessor macro called BABYSTEP_ALLOWED, but now it is a function. It more common to use lower case for function names --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index b7e0d6f8e..4205d0822 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -370,7 +370,7 @@ bool check_fsensor(); //! 2) Not allowed during Homing (printer busy) //! 3) Not allowed during Mesh Bed Leveling (printer busy) //! 4) Allowed if there are queued blocks OR there is a print job running -bool BABYSTEP_ALLOWED(); +bool babystep_allowed(); extern void calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 06b371b98..67917a396 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -545,7 +545,7 @@ bool check_fsensor() { && e_active(); } -bool __attribute__((noinline)) BABYSTEP_ALLOWED() { +bool __attribute__((noinline)) babystep_allowed() { return (axis_known_position[Z_AXIS] && !homing_flag && !mesh_bed_leveling_flag && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0892fd1eb..553a96e1e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4628,7 +4628,7 @@ static void lcd_settings_menu() MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); #endif //HAS_SECOND_SERIAL - if ( BABYSTEP_ALLOWED() ) + if ( babystep_allowed() ) MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); #if (LANG_MODE != 0) @@ -5337,7 +5337,7 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(PSTR("power panic"), uvlo_); #endif //TMC2130_DEBUG - if ( BABYSTEP_ALLOWED() ) { + if ( babystep_allowed() ) { MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 } @@ -7457,7 +7457,7 @@ void menu_lcd_longpress_func(void) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // The lists are not the same for both functions, so first decide which function is to be performed - if (BABYSTEP_ALLOWED()){ // long press as live-adj-z + if (babystep_allowed()){ // long press as live-adj-z if ( menu_menu == lcd_status_screen // and in listed menus... || menu_menu == lcd_main_menu || menu_menu == lcd_tune_menu @@ -7493,7 +7493,7 @@ void menu_lcd_longpress_func(void) static inline bool z_menu_expired() { return (menu_menu == lcd_babystep_z - && (!BABYSTEP_ALLOWED() || (lcd_commands_type == LcdCommands::Idle && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z)))); + && (!babystep_allowed() || (lcd_commands_type == LcdCommands::Idle && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z)))); } static inline bool other_menu_expired() { From 59314a41c12d8cc4963629f999058f82062cd063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 09:51:12 +0000 Subject: [PATCH 057/240] PFW-1503 only allow babystepping on the first couple of layers Change in memory: Flash: +28 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 4205d0822..c4ac86a93 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -366,7 +366,7 @@ extern bool printer_active(); bool check_fsensor(); //! Condition where Babystepping is allowed: -//! 1) Axis are trusted: Z-axis position must be known +//! 1) Z-axis position is less than 2.0mm (only allowed during the first couple of layers) //! 2) Not allowed during Homing (printer busy) //! 3) Not allowed during Mesh Bed Leveling (printer busy) //! 4) Allowed if there are queued blocks OR there is a print job running diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 67917a396..12268663c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -546,7 +546,7 @@ bool check_fsensor() { } bool __attribute__((noinline)) babystep_allowed() { - return (axis_known_position[Z_AXIS] + return ( (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) ); From 561d8599d29daa9acb0f68f0a2adec1a4bfac641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 12 Mar 2023 09:55:17 +0000 Subject: [PATCH 058/240] PFW-1503 drop {} for consistency --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 553a96e1e..3bb330bb0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5337,9 +5337,8 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(PSTR("power panic"), uvlo_); #endif //TMC2130_DEBUG - if ( babystep_allowed() ) { + if ( babystep_allowed() ) MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 - } if (farm_mode) MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 From e40d8ebbcc68e213bd698d96024df2506a7331ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 12:15:44 +0000 Subject: [PATCH 059/240] Implement printJobOngoing() This makes the if statments a little bit more readable Change in memory: Flash: -88 bytes SRAM: 0 bytes --- Firmware/Filament_sensor.cpp | 6 ++---- Firmware/Marlin.h | 6 +++++- Firmware/Marlin_main.cpp | 13 ++++++++----- Firmware/fancheck.cpp | 2 +- Firmware/ultralcd.cpp | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index dbccf2760..9fb9c881c 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -113,8 +113,7 @@ void Filament_sensor::triggerFilamentInserted() { && (! MMU2::mmu2.Enabled() ) // quick and dirty hack to prevent spurious runouts while the MMU is in charge && !( moves_planned() != 0 - || IS_SD_PRINTING - || usb_timer.running() + || printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) ) @@ -131,8 +130,7 @@ void Filament_sensor::triggerFilamentRemoved() { && !saved_printing && ( moves_planned() != 0 - || IS_SD_PRINTING - || usb_timer.running() + || printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) ) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c4ac86a93..b7d376255 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -354,7 +354,11 @@ extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff -extern bool printer_active(); +// Returns true if there is a print running. It does not matter if +// the print is paused, that still counts as a "running" print. +bool printJobOngoing(); + +bool printer_active(); //! Beware - mcode_in_progress is set as soon as the command gets really processed, //! which is not the same as posting the M600 command into the command queue diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 12268663c..1d71c3f01 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -525,9 +525,12 @@ void servo_init() #endif } +bool __attribute__((noinline)) printJobOngoing() { + return (IS_SD_PRINTING || usb_timer.running()); +} + bool __attribute__((noinline)) printer_active() { - return IS_SD_PRINTING - || usb_timer.running() + return printJobOngoing() || isPrintPaused || (custom_message_type == CustomMsg::TempCal) || saved_printing @@ -539,7 +542,7 @@ bool __attribute__((noinline)) printer_active() { // Currently only used in one place, allowed to be inlined bool check_fsensor() { - return (IS_SD_PRINTING || usb_timer.running()) + return printJobOngoing() && mcode_in_progress != 600 && !saved_printing && e_active(); @@ -548,7 +551,7 @@ bool check_fsensor() { bool __attribute__((noinline)) babystep_allowed() { return ( (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag - && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && (IS_SD_PRINTING || usb_timer.running()) )) + && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && printJobOngoing() )) ); } @@ -9574,7 +9577,7 @@ void ThermalStop(bool allow_recovery) Stopped = true; // Either pause or stop the print - if(allow_recovery && (IS_SD_PRINTING || usb_timer.running())) { + if(allow_recovery && printJobOngoing()) { if (!isPrintPaused) { lcd_setalertstatuspgm(_T(MSG_PAUSED_THERMAL_ERROR), LCD_STATUS_CRITICAL); diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index 3bf2a6c1f..d3f7e55d6 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -85,7 +85,7 @@ void fanSpeedError(unsigned char _fan) { if (fan_check_error == EFCE_REPORTED) return; fan_check_error = EFCE_REPORTED; - if (IS_SD_PRINTING || usb_timer.running()) { + if (printJobOngoing()) { // A print is ongoing, pause the print normally if(!isPrintPaused) { if (usb_timer.running()) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3bb330bb0..7fb60f668 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3495,7 +3495,7 @@ static void crash_mode_switch() { lcd_crash_detect_enable(); } - if (IS_SD_PRINTING || usb_timer.running() || (lcd_commands_type == LcdCommands::Layer1Cal)) menu_goto(lcd_tune_menu, 9, true, true); + if (printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal)) menu_goto(lcd_tune_menu, 9, true, true); else menu_goto(lcd_settings_menu, 9, true, true); } #endif //TMC2130 @@ -5371,7 +5371,7 @@ static void lcd_main_menu() } } } - if((IS_SD_PRINTING || usb_timer.running() || isPrintPaused) && (custom_message_type != CustomMsg::MeshBedLeveling) && !processing_tcode) { + if((printJobOngoing() || isPrintPaused) && (custom_message_type != CustomMsg::MeshBedLeveling) && !processing_tcode) { MENU_ITEM_SUBMENU_P(_T(MSG_STOP_PRINT), lcd_sdcard_stop); } #ifdef TEMP_MODEL @@ -5399,7 +5399,7 @@ static void lcd_main_menu() } #endif //SDSUPPORT - if(!isPrintPaused && !IS_SD_PRINTING && !usb_timer.running() && (lcd_commands_type != LcdCommands::Layer1Cal)) { + if(!isPrintPaused && !printJobOngoing() && (lcd_commands_type != LcdCommands::Layer1Cal)) { if (!farm_mode) { const int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); const int8_t nextSheet = eeprom_next_initialized_sheet(sheet); @@ -5409,7 +5409,7 @@ static void lcd_main_menu() } } - if ( ! ( IS_SD_PRINTING || usb_timer.running() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { + if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { if (MMU2::mmu2.Enabled()) { 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 From 942021cb2bc871a1b84d0f2c3025fdc23d322df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 12:47:40 +0000 Subject: [PATCH 060/240] PFW-1503 Fix an issue where the menu is dismissed in First layer calibraiton When the extruder lifts up after completing the Purge line, the baby stepping is not allowed for a short time. This dismisses the menu. We don't want this behavior, so only apply the Z-axis requirement when printing. Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 4 +++- Firmware/Marlin_main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index b7d376255..1cef467d6 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -373,7 +373,9 @@ bool check_fsensor(); //! 1) Z-axis position is less than 2.0mm (only allowed during the first couple of layers) //! 2) Not allowed during Homing (printer busy) //! 3) Not allowed during Mesh Bed Leveling (printer busy) -//! 4) Allowed if there are queued blocks OR there is a print job running +//! 4) Allowed if: +//! - First Layer Calibration is running +//! - OR there are queued blocks, printJob is running and it's not paused, and Z-axis position is less than 2.0mm (only allowed during the first couple of layers) bool babystep_allowed(); extern void calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1d71c3f01..8b1562955 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -549,9 +549,9 @@ bool check_fsensor() { } bool __attribute__((noinline)) babystep_allowed() { - return ( (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) - && !homing_flag && !mesh_bed_leveling_flag - && ( blocks_queued() || lcd_commands_type == LcdCommands::Layer1Cal || ( !isPrintPaused && printJobOngoing() )) + return ( !homing_flag + && !mesh_bed_leveling_flag + && ( lcd_commands_type == LcdCommands::Layer1Cal || ( blocks_queued() && !isPrintPaused && printJobOngoing() && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU))) ); } From 5f8fc64a32b450e2cae845eddcf471bbff75cfc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 15:34:47 +0000 Subject: [PATCH 061/240] Restore previous Z-lift in M701/M702 Previously when the firmware called M701/M702 manually there was no Z lift. But after we added support for the Z parameter we set the default to 50mm. Change strings "M701" to "M701 Z0" and "M702" to "M702 Z0" to restore the previous behavior from before 3.13. Also pulled the gcodes into PROGMEM in message.cpp along with M83 and M84 to save memory. Change in memory: Flash: -34 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 6 +++--- Firmware/first_lay_cal.cpp | 13 +++++-------- Firmware/messages.cpp | 6 ++++++ Firmware/messages.h | 6 ++++++ Firmware/ultralcd.cpp | 14 +++++++------- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b82105d90..65933485a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2082,7 +2082,7 @@ bool check_commands() { while (buflen) { - if ((code_seen_P(PSTR("M84"))) || (code_seen_P(PSTR("M 84")))) end_command_found = true; + if ((code_seen_P(MSG_M84)) || (code_seen_P(PSTR("M 84")))) end_command_found = true; if (!cmdbuffer_front_already_processed) cmdqueue_pop_front(); cmdbuffer_front_already_processed = false; @@ -10783,7 +10783,7 @@ void recover_print(uint8_t automatic) { sprintf_P(cmd, PSTR("M109 S%d"), target_temperature[active_extruder]); enquecommand(cmd); - enquecommand_P(PSTR("M83")); //E axis relative mode + enquecommand_P(MSG_M83); //E axis relative mode // If not automatically recoreverd (long power loss) if(automatic == 0){ @@ -11150,7 +11150,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) { // First unretract (relative extrusion) if(!saved_extruder_relative_mode){ - enquecommand(PSTR("M83"), true); + enquecommand_P(MSG_M83); } //retract 45mm/s // A single sprintf may not be faster, but is definitely 20B shorter diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 980af8b52..cc186dbd6 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -62,7 +62,7 @@ bool lay1cal_load_filament(char *cmd_buffer, uint8_t filament) { if (MMU2::mmu2.Enabled()) { - enquecommand_P(PSTR("M83")); + enquecommand_P(MSG_M83); enquecommand_P(PSTR("G1 Y-3 F1000")); enquecommand_P(PSTR("G1 Z0.4 F1000")); @@ -72,7 +72,7 @@ bool lay1cal_load_filament(char *cmd_buffer, uint8_t filament) return false; } else if( currentTool != (uint8_t)MMU2::FILAMENT_UNKNOWN){ // some other slot is loaded, perform an unload first - enquecommand_P(PSTR("M702")); + enquecommand_P(MSG_M702_NO_LIFT); } // perform a toolchange // sprintf_P(cmd_buffer, PSTR("T%d"), filament); @@ -142,7 +142,6 @@ void lay1cal_before_meander() { static const char cmd_pre_meander_1[] PROGMEM = "G21"; //set units to millimeters TODO unsupported command static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates - static const char cmd_pre_meander_3[] PROGMEM = "M83"; //use relative distances for extrusion TODO: duplicate static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.5 F2100"; static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200"; static const char cmd_pre_meander_6[] PROGMEM = "M204 S1000"; //set acceleration @@ -153,7 +152,7 @@ void lay1cal_before_meander() zero_extrusion, cmd_pre_meander_1, cmd_pre_meander_2, - cmd_pre_meander_3, + MSG_M83, // use relative distances for extrusion cmd_pre_meander_4, cmd_pre_meander_5, cmd_pre_meander_6, @@ -254,8 +253,6 @@ void lay1cal_finish(bool mmu_enabled) static const char cmd_cal_finish_3[] PROGMEM = "M140 S0"; // turn off heatbed static const char cmd_cal_finish_4[] PROGMEM = "G1 Z10 F1300"; //lift Z static const char cmd_cal_finish_5[] PROGMEM = "G1 X10 Y180 F4000"; //Go to parking position - static const char cmd_cal_finish_6[] PROGMEM = "M702"; //unload from nozzle - static const char cmd_cal_finish_7[] PROGMEM = "M84";// disable motors static const char * const cmd_cal_finish[] PROGMEM = { @@ -272,6 +269,6 @@ void lay1cal_finish(bool mmu_enabled) enquecommand_P(static_cast(pgm_read_ptr(&cmd_cal_finish[i]))); } - if (mmu_enabled) enquecommand_P(cmd_cal_finish_6); //unload from nozzle - enquecommand_P(cmd_cal_finish_7);// disable motors + if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle + enquecommand_P(MSG_M84);// disable motors } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index ed8dd4ad5..b42a97e8f 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -228,3 +228,9 @@ const char MSG_ADVANCE_K[] PROGMEM_N1 = "Advance K:"; ////c=13 const char MSG_POWERPANIC_DETECTED[] PROGMEM_N1 = "POWER PANIC DETECTED"; ////c=20 const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; + +// Common G-gcodes +const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; +const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; +const char MSG_M83[] PROGMEM_N1 = "M83"; +const char MSG_M84[] PROGMEM_N1 = "M84"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 276bab0a7..54ab8466f 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -235,6 +235,12 @@ extern const char MSG_POWERPANIC_DETECTED[]; extern const char MSG_LCD_STATUS_CHANGED[]; extern const char MSG_UNKNOWN_CODE[]; +// Common G-gcodes +extern const char MSG_M701_NO_LIFT[]; +extern const char MSG_M702_NO_LIFT[]; +extern const char MSG_M83[]; +extern const char MSG_M84[]; + #if defined(__cplusplus) } #endif //defined(__cplusplus) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f327fbdc1..710a6a1a8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1847,10 +1847,10 @@ switch(eFilamentAction) // FALLTHRU case FilamentAction::Load: loading_flag=true; - enquecommand_P(PSTR("M701")); // load filament + enquecommand_P(MSG_M701_NO_LIFT); // load filament break; case FilamentAction::UnLoad: - enquecommand_P(PSTR("M702")); // unload filament + enquecommand_P(MSG_M702_NO_LIFT); // unload filament break; case FilamentAction::MmuLoad: case FilamentAction::MmuLoadingTest: @@ -1908,11 +1908,11 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) { loading_flag = true; - enquecommand_P(PSTR("M701")); // load filament + enquecommand_P(MSG_M701_NO_LIFT); // load filament if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } if (eFilamentAction == FilamentAction::UnLoad) - enquecommand_P(PSTR("M702")); // unload filament + enquecommand_P(MSG_M702_NO_LIFT); // unload filament } break; case FilamentAction::MmuLoad: @@ -3804,7 +3804,7 @@ static void lcd_wizard_load() { loading_flag = true; } gcode_M701(FILAMENTCHANGE_FIRSTFEED, 0); - //enquecommand_P(PSTR("M701")); + //enquecommand_P(MSG_M701_NO_LIFT); // is enqueuecommand_P safe here? } static void wizard_lay1cal_message(bool cold) @@ -4593,7 +4593,7 @@ static void lcd_settings_menu() if (!printer_active() || isPrintPaused) { MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_axis);////MSG_MOVE_AXIS c=18 - MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=18 + MENU_ITEM_GCODE_P(_i("Disable steppers"), MSG_M84);////MSG_DISABLE_STEPPERS c=18 } #ifdef FILAMENT_SENSOR @@ -6363,7 +6363,7 @@ bool lcd_selftest() _progress = lcd_selftest_screen(TestScreen::Failed, _progress, 3, true, 5000); } lcd_reset_alert_level(); - enquecommand_P(PSTR("M84")); + enquecommand_P(MSG_M84); lcd_update_enable(true); if (_result) From 7c0ead7bc280448667f315f3f510742748839131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 16:15:10 +0000 Subject: [PATCH 062/240] Add M24 into PROGMEM Change in memory: Flash: -8 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 2 +- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 65933485a..6e3d3402e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4182,7 +4182,7 @@ void process_commands() } else if (code_seen_P(PSTR("uvlo"))) { // PRUSA uvlo eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); } else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES { diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 4f8ee6c58..bc54e24af 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -654,7 +654,7 @@ void CardReader::checkautostart(bool force) sprintf_P(cmd, PSTR("M23 %s"), autoname); enquecommand(cmd); // M24: Start/resume SD print - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); found=true; } } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index b42a97e8f..0d5c0b84f 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -232,5 +232,6 @@ const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; +const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 54ab8466f..847e21cd0 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -238,6 +238,7 @@ extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes extern const char MSG_M701_NO_LIFT[]; extern const char MSG_M702_NO_LIFT[]; +extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 710a6a1a8..df26ccf51 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7304,7 +7304,7 @@ static void menu_action_sdfile(const char* filename) } if (result) { enquecommand(cmd); - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); } lcd_return_to_status(); From 129cc18cbfac303d01d144ad1381351527752d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 16:18:05 +0000 Subject: [PATCH 063/240] Add M23 %s into PROGMEM Change in memory: Flash: -14 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 2 +- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6e3d3402e..61ba0f2bc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10915,7 +10915,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { MYSERIAL.print(filename); strcat_P(filename, PSTR(".gco")); - sprintf_P(cmd, PSTR("M23 %s"), filename); + sprintf_P(cmd, MSG_M23, filename); enquecommand(cmd); uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index bc54e24af..f91f05b52 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -651,7 +651,7 @@ void CardReader::checkautostart(bool force) { char cmd[30]; // M23: Select SD file - sprintf_P(cmd, PSTR("M23 %s"), autoname); + sprintf_P(cmd, MSG_M23, autoname); enquecommand(cmd); // M24: Start/resume SD print enquecommand_P(MSG_M24); diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 0d5c0b84f..83e1cc766 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -232,6 +232,7 @@ const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; +const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 847e21cd0..1881315d8 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -238,6 +238,7 @@ extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes extern const char MSG_M701_NO_LIFT[]; extern const char MSG_M702_NO_LIFT[]; +extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index df26ccf51..79e4a0f41 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7269,7 +7269,7 @@ static void menu_action_sdfile(const char* filename) char cmd[30]; char* c; bool result = true; - sprintf_P(cmd, PSTR("M23 %s"), filename); + sprintf_P(cmd, MSG_M23, filename); for (c = &cmd[4]; *c; c++) *c = tolower(*c); From 466a6a8fc373d73db68b3c6ab6997e151fe3d19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 16:33:13 +0000 Subject: [PATCH 064/240] Add M600 into PROGMEM Change in memory: Flash: -10 bytes SRAM: 0 bytes --- Firmware/Filament_sensor.cpp | 4 ++-- Firmware/messages.cpp | 5 +++-- Firmware/messages.h | 5 +++-- Firmware/mmu2.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index dbccf2760..e99ab928c 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -163,7 +163,7 @@ void Filament_sensor::filRunout() { restore_print_from_ram_and_continue(0); eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT); eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT); - enquecommand_front_P((PSTR("M600"))); + enquecommand_front_P(MSG_M600); } void Filament_sensor::triggerError() { @@ -483,7 +483,7 @@ void PAT9125_sensor::filJam() { restore_print_from_ram_and_continue(0); eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT); eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT); - enquecommand_front_P((PSTR("M600"))); + enquecommand_front_P(MSG_M600); } bool PAT9125_sensor::updatePAT9125() { diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 83e1cc766..66d35a09c 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -230,9 +230,10 @@ const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes -const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; -const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; +const char MSG_M600[] PROGMEM_N1 = "M600"; +const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; +const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 1881315d8..c50f9baab 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -236,12 +236,13 @@ extern const char MSG_LCD_STATUS_CHANGED[]; extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes -extern const char MSG_M701_NO_LIFT[]; -extern const char MSG_M702_NO_LIFT[]; extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; +extern const char MSG_M600[]; +extern const char MSG_M701_NO_LIFT[]; +extern const char MSG_M702_NO_LIFT[]; #if defined(__cplusplus) } diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 46ed0d664..62b46375e 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -188,7 +188,7 @@ void MMU2::CheckFINDARunout() { if (SpoolJoin::spooljoin.isSpoolJoinEnabled() && get_current_tool() != (uint8_t)FILAMENT_UNKNOWN){ // Can't auto if F=? enquecommand_front_P(PSTR("M600 AUTO")); // save print and run M600 command } else { - enquecommand_front_P(PSTR("M600")); // save print and run M600 command + enquecommand_front_P(MSG_M600); // save print and run M600 command } } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 79e4a0f41..2df85e00f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5490,7 +5490,7 @@ void stepper_timer_overflow() { static void lcd_colorprint_change() { - enquecommand_P(PSTR("M600")); + enquecommand_P(MSG_M600); custom_message_type = CustomMsg::FilamentLoading; //just print status message lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS)); From 733bc874fba60b31f3094d6fe1617fcf9d6c461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 16:48:30 +0000 Subject: [PATCH 065/240] Move G28W0 to messages No change in memory --- Firmware/Marlin_main.cpp | 1 - Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 61ba0f2bc..ad4f75afc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -255,7 +255,6 @@ uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; -const char G28W0[] PROGMEM = "G28 W0"; // Define some coordinates outside the clamp limits (making them invalid past the parsing stage) so // that they can be used later for various logical checks diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 66d35a09c..deeaa40f9 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -230,6 +230,7 @@ const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes +const char G28W0[] PROGMEM_N1 = "G28 W0"; const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; diff --git a/Firmware/messages.h b/Firmware/messages.h index c50f9baab..906071980 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -236,6 +236,7 @@ extern const char MSG_LCD_STATUS_CHANGED[]; extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes +extern const char G28W0[]; extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; From 5ade1716bfa42f46c3b36c3b64a0466d152a71ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 17:01:59 +0000 Subject: [PATCH 066/240] Add M500 into PROGMEM Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index deeaa40f9..6a906c34b 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -235,6 +235,7 @@ const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; +const char MSG_M500[] PROGMEM_N1 = "M500"; const char MSG_M600[] PROGMEM_N1 = "M600"; const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 906071980..ccc614a47 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -241,6 +241,7 @@ extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; +extern const char MSG_M500[]; extern const char MSG_M600[]; extern const char MSG_M701_NO_LIFT[]; extern const char MSG_M702_NO_LIFT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2df85e00f..815c1a46e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -916,7 +916,7 @@ void lcd_commands() if (_Kp != 0 || _Ki != 0 || _Kd != 0) { sprintf_P(cmd1, PSTR("M301 P%.2f I%.2f D%.2f"), _Kp, _Ki, _Kd); enquecommand(cmd1); - enquecommand_P(PSTR("M500")); + enquecommand_P(MSG_M500); } else { SERIAL_ECHOPGM("Invalid PID cal. results. Not stored to EEPROM."); @@ -950,7 +950,7 @@ void lcd_commands() case 2: if (temp_model_autotune_result()) - enquecommand_P(PSTR("M500")); + enquecommand_P(MSG_M500); lcd_commands_step = 1; break; From 00515a975d8071af46d900bbac60763b62d1f222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 17:05:35 +0000 Subject: [PATCH 067/240] Add M107 into PROGMEM Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/first_lay_cal.cpp | 5 ++--- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index cc186dbd6..d3baf5134 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -41,7 +41,7 @@ void lay1cal_wait_preheat() { const char * const preheat_cmd[] = { - PSTR("M107"), + MSG_M107, PSTR("M190"), PSTR("M109"), PSTR("G28"), @@ -247,7 +247,6 @@ void lay1cal_square(uint8_t step, float layer_height, float extrusion_width) void lay1cal_finish(bool mmu_enabled) { - static const char cmd_cal_finish_0[] PROGMEM = "M107"; //turn off printer fan static const char cmd_cal_finish_1[] PROGMEM = "G1 E-0.075 F2100"; //retract static const char cmd_cal_finish_2[] PROGMEM = "M104 S0"; // turn off temperature static const char cmd_cal_finish_3[] PROGMEM = "M140 S0"; // turn off heatbed @@ -256,7 +255,7 @@ void lay1cal_finish(bool mmu_enabled) static const char * const cmd_cal_finish[] PROGMEM = { - cmd_cal_finish_0, + MSG_M107, // turn off printer fan cmd_cal_finish_1, cmd_cal_finish_2, cmd_cal_finish_3, diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 6a906c34b..3b88702d8 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -235,6 +235,7 @@ const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; +const char MSG_M107[] PROGMEM_N1 = "M107"; const char MSG_M500[] PROGMEM_N1 = "M500"; const char MSG_M600[] PROGMEM_N1 = "M600"; const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; diff --git a/Firmware/messages.h b/Firmware/messages.h index ccc614a47..6d6fa63e9 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -241,6 +241,7 @@ extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; +extern const char MSG_M107[]; extern const char MSG_M500[]; extern const char MSG_M600[]; extern const char MSG_M701_NO_LIFT[]; From 6edd8b0719f7c99c6c25e9607356ffdf637ee957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 17:09:43 +0000 Subject: [PATCH 068/240] Add M220 into PROGMEM Change in memory: Flash: -10 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ad4f75afc..80fbb0e7f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3584,7 +3584,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float // Recover feed rate feedmultiply = feedmultiplyBckp; char cmd[9]; - sprintf_P(cmd, PSTR("M220 S%i"), feedmultiplyBckp); + sprintf_P(cmd, MSG_M220, feedmultiplyBckp); enquecommand(cmd); } @@ -10957,7 +10957,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { // Set the feedrates saved at the power panic. sprintf_P(cmd, PSTR("G1 F%d"), feedrate_rec); enquecommand(cmd); - sprintf_P(cmd, PSTR("M220 S%d"), feedmultiply_rec); + sprintf_P(cmd, MSG_M220, feedmultiply_rec); enquecommand(cmd); // Set the fan speed saved at the power panic. sprintf_P(cmd, PSTR("M106 S%u"), fan_speed_rec); diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 3b88702d8..577570439 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -236,6 +236,7 @@ const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; const char MSG_M107[] PROGMEM_N1 = "M107"; +const char MSG_M220[] PROGMEM_N1 = "M220 S%d"; const char MSG_M500[] PROGMEM_N1 = "M500"; const char MSG_M600[] PROGMEM_N1 = "M600"; const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 6d6fa63e9..d6b67e05e 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -242,6 +242,7 @@ extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; extern const char MSG_M107[]; +extern const char MSG_M220[]; extern const char MSG_M500[]; extern const char MSG_M600[]; extern const char MSG_M701_NO_LIFT[]; From f296b3f8267384ee6f4206d55dda2a70d33056a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 17:23:01 +0000 Subject: [PATCH 069/240] G21 is not implemented, don't queue it It's just a single 'break', will likely not be implemented Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/first_lay_cal.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index d3baf5134..87d94c55c 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -140,7 +140,6 @@ void lay1cal_intro_line(bool extraPurgeNeeded, float layer_height, float extrusi //! @brief Setup for printing meander void lay1cal_before_meander() { - static const char cmd_pre_meander_1[] PROGMEM = "G21"; //set units to millimeters TODO unsupported command static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.5 F2100"; static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200"; @@ -150,7 +149,6 @@ void lay1cal_before_meander() static const char * const cmd_pre_meander[] PROGMEM = { zero_extrusion, - cmd_pre_meander_1, cmd_pre_meander_2, MSG_M83, // use relative distances for extrusion cmd_pre_meander_4, From bc27b7172929ff0bd73527d27d6e55cfbce331da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 17:37:27 +0000 Subject: [PATCH 070/240] Pull one common G1 gcode into PROGMEM Change in memory: Flash: -32 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 6 +++--- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 80fbb0e7f..3cee10a55 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10789,7 +10789,7 @@ void recover_print(uint8_t automatic) { //Extrude some filament to stabilize the pressure enquecommand_P(PSTR("G1 E5 F120")); // Retract to be consistent with a short pause - sprintf_P(cmd, PSTR("G1 E%-0.3f F2700"), default_retraction); + sprintf_P(cmd, G1_E_F2700, default_retraction); enquecommand(cmd); } @@ -10946,7 +10946,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { enquecommand(cmd); // Unretract. - sprintf_P(cmd, PSTR("G1 E%0.3f F2700"), default_retraction); + sprintf_P(cmd, G1_E_F2700, default_retraction); enquecommand(cmd); // Recover final E axis position and mode float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); @@ -11157,7 +11157,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) // A snprintf would have been a safer call, but since it is not used // in the whole program, its implementation would bring more bytes to the total size // The behavior of dtostrf 8,3 should be roughly the same as %-0.3 - sprintf_P(buf, PSTR("G1 E%-0.3f F2700"), e_move); + sprintf_P(buf, G1_E_F2700, e_move); enquecommand(buf, false); } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 577570439..988a00d0c 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -230,6 +230,7 @@ const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes +const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-0.3f F2700"; const char G28W0[] PROGMEM_N1 = "G28 W0"; const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; diff --git a/Firmware/messages.h b/Firmware/messages.h index d6b67e05e..81ba55bd8 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -236,6 +236,7 @@ extern const char MSG_LCD_STATUS_CHANGED[]; extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes +extern const char G1_E_F2700[]; extern const char G28W0[]; extern const char MSG_M23[]; extern const char MSG_M24[]; From 5643d16c0139e9db1eb9bf3f9d9594943c98f7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Thu, 16 Feb 2023 21:04:14 +0000 Subject: [PATCH 071/240] cleanup: remove redundant lcd_update in cashdet_detected There is no need to repeat: lcd_update_enable(true); lcd_update(2); Also lcd_clear() is redundant because lcd_update(2) will clear the LCD Change in memory: Flash: -16 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b82105d90..07c2cfde6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -585,24 +585,17 @@ void crashdet_detected(uint8_t mask) crashDetTimer.start(); crashDet_axes |= mask; - lcd_update_enable(true); - lcd_clear(); - lcd_update(2); - - if (mask & X_AXIS_MASK) - { + if (mask & X_AXIS_MASK) { eeprom_increment_byte((uint8_t*)EEPROM_CRASH_COUNT_X); eeprom_increment_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT); } - if (mask & Y_AXIS_MASK) - { + if (mask & Y_AXIS_MASK) { eeprom_increment_byte((uint8_t*)EEPROM_CRASH_COUNT_Y); eeprom_increment_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); } - lcd_update_enable(true); - lcd_update(2); - + lcd_update_enable(true); + lcd_update(2); // prepare the status message with the _current_ axes status crashdet_fmt_error(msg, mask); lcd_setstatus(msg); From e2b58d8724cd894c51078b796d936d0bede6e498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Mar 2023 16:50:42 +0000 Subject: [PATCH 072/240] Don't translate the more button --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_error_converter.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index d88819feb..44a205666 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -332,7 +332,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("RstMMU"); ////MSG_BTN static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 -static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8 +static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 3673f7d90..0f9975026 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){ } const char * PrusaErrorButtonMore(){ - return _R(MSG_BTN_MORE); + return MSG_BTN_MORE; } struct ResetOnExit { diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index e2d537939..87615b56e 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -77,7 +77,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // Render the choices - lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), two_choices ? PrusaErrorButtonMore() : _T(PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : PrusaErrorButtonMore()); } void ReportErrorHookSensorLineRender(){ From 0dbae6b6091f69adacb271e2eb6be91079023a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Mar 2023 16:52:40 +0000 Subject: [PATCH 073/240] Remove MSG_BTN_MORE from translation files --- lang/po/Firmware.pot | 6 ------ lang/po/Firmware_cs.po | 6 ------ lang/po/Firmware_de.po | 6 ------ lang/po/Firmware_es.po | 6 ------ lang/po/Firmware_fr.po | 6 ------ lang/po/Firmware_hr.po | 6 ------ lang/po/Firmware_hu.po | 6 ------ lang/po/Firmware_it.po | 6 ------ lang/po/Firmware_nl.po | 6 ------ lang/po/Firmware_no.po | 6 ------ lang/po/Firmware_pl.po | 6 ------ lang/po/Firmware_ro.po | 6 ------ lang/po/Firmware_sk.po | 6 ------ lang/po/Firmware_sv.po | 6 ------ 14 files changed, 84 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 2d7397aba..f43412179 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -2430,12 +2430,6 @@ msgstr "" msgid "unknown state" msgstr "" -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 #: ../../Firmware/ultralcd.cpp:5946 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index b1bb2acdd..ba93df4b1 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2530,12 +2530,6 @@ msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 20d051d30..da3a4330f 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2558,12 +2558,6 @@ msgstr "" "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Update auf Version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 4cf573a06..2ab0eb212 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2554,12 +2554,6 @@ 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_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 5d07bd843..335b2bb29 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2568,12 +2568,6 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 06c1a473c..691d243e2 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2547,12 +2547,6 @@ msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index b167556ef..2b635ace7 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2551,12 +2551,6 @@ msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " "2.1.9-es verzióra." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index c3ea06a54..e7d6784ba 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2552,12 +2552,6 @@ msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index d10c04a6e..50aebbd28 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2556,12 +2556,6 @@ msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index c22c4144f..90a5469c3 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2529,12 +2529,6 @@ msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index aa0ffbd91..d155d39ea 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2548,12 +2548,6 @@ msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 2dacda832..a6b941960 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2552,12 +2552,6 @@ msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 12c26c5fb..90f1166f4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2535,12 +2535,6 @@ msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 10a81b9fd..ca0d5668a 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2542,12 +2542,6 @@ msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 178c1f4aa61e74521bed849ac492abf96c2a1191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 20 Mar 2023 13:57:20 +0000 Subject: [PATCH 074/240] Header cleanup --- Firmware/Filament_sensor.cpp | 1 - Firmware/fancheck.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index 9fb9c881c..3b373736d 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -4,7 +4,6 @@ #include "Filament_sensor.h" #include "Timer.h" -#include "cardreader.h" #include "eeprom.h" #include "menu.h" #include "planner.h" diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index d3f7e55d6..4e6ae2741 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -1,6 +1,5 @@ // fan control and check #include "fancheck.h" -#include "cardreader.h" #include "ultralcd.h" #include "sound.h" #include "messages.h" From c5fc1168ed1d653a45d7d24ccd2be14f3af4ed5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 20 Mar 2023 20:35:49 +0000 Subject: [PATCH 075/240] PFW-1515 Fix an issue with Thermal Anomaly message Issue introduced with PFW-1504 Change in memory: Flash: +40 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f327fbdc1..ff1de02aa 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -562,7 +562,9 @@ void lcdui_print_status_line(void) { scrollstuff = 0; } } else { // Otherwise check for other special events - if (!lcd_status_message_timeout.expired_cont(LCD_STATUS_DELAYED_TIMEOUT)) + if ( custom_message_type != CustomMsg::Status + && lcd_status_message_timeout.running() + && lcd_status_message_timeout.elapsed() < LCD_STATUS_DELAYED_TIMEOUT) { return; // Nothing to do, waiting for delay to expire } From 5536873ecad58fbfb5c2282915518d39bd4097bd Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 22 Mar 2023 09:50:59 +0100 Subject: [PATCH 076/240] Fix HBed on Load for MMU Loading test --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f327fbdc1..e62de87a5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1783,6 +1783,7 @@ bool shouldPreheatOnlyNozzle() { case FilamentAction::UnLoad: case FilamentAction::MmuLoad: case FilamentAction::MmuUnLoad: + case FilamentAction::MmuLoadingTest: case FilamentAction::MmuEject: case FilamentAction::MmuCut: return true; From 7e0bf88431e864f11569f00ae7df01c3b77cd721 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 22 Mar 2023 12:30:16 +0100 Subject: [PATCH 077/240] Use `G28 W` only --- Firmware/Marlin_main.cpp | 10 +++++----- Firmware/messages.cpp | 2 +- Firmware/messages.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3cee10a55..554d3f6ca 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2809,7 +2809,7 @@ static void gcode_G80() // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P(G28W0); + enquecommand_front_P(G28W); return; } @@ -2842,7 +2842,7 @@ static void gcode_G80() temp_compensation_start(); run = true; repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P(G28W0); + enquecommand_front_P(G28W); return; } run = false; @@ -4736,7 +4736,7 @@ void process_commands() // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G76 with all its parameters - enquecommand_front_P(G28W0); + enquecommand_front_P(G28W); break; } lcd_show_fullscreen_message_and_wait_P(_i("Stable ambient temperature 21-26C is needed a rigid stand is required."));////MSG_TEMP_CAL_WARNING c=20 r=4 @@ -4881,7 +4881,7 @@ void process_commands() // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G76 with all its parameters - enquecommand_front_P(G28W0); + enquecommand_front_P(G28W); break; } puts_P(_N("PINDA probe calibration start")); @@ -10101,7 +10101,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P(G28W0); + enquecommand_front_P(G28W); enquecommand_front_P((PSTR("G1 Z5"))); return; } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 988a00d0c..ad9b2b2f3 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -231,7 +231,7 @@ const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-0.3f F2700"; -const char G28W0[] PROGMEM_N1 = "G28 W0"; +const char G28W[] PROGMEM_N1 = "G28 W"; const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 81ba55bd8..d7a1bc997 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -237,7 +237,7 @@ extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes extern const char G1_E_F2700[]; -extern const char G28W0[]; +extern const char G28W[]; extern const char MSG_M23[]; extern const char MSG_M24[]; extern const char MSG_M83[]; From 86ae64ea5988c99e4c3578d6ac25d3cca0e1119a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 22 Mar 2023 18:03:18 +0100 Subject: [PATCH 078/240] Update Hungarian translation. Credits to @AttilaSVK --- lang/po/Firmware_hu.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index b167556ef..ea80cc2ed 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2128,7 +2128,7 @@ msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" msgstr "" -"Termikus modell kal. kb. 12 percet. Lásd\n" +"Termikus modell kal. kb. 12 perc. Lásd\n" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 @@ -2495,13 +2495,13 @@ msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." msgstr "" -"Az izzószál váratlanul észlelve. Győződjön meg arról, hogy nincs izzószál " +"Filament váratlanul észlelve. Győződjön meg arról, hogy nincs filament " "betöltve. Ellenőrizze az érzékelőket és a vezetékeket." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 #: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 msgid "LOAD TO EXTR. FAILED" -msgstr "SIKERÜLT BETÖLT EXTR" +msgstr "BETÖLTÉS SIKERTELEN" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 @@ -2510,12 +2510,12 @@ msgid "" "sensor calibration, if needed." msgstr "" "Az extruderbe való betöltés nem sikerült. Ellenőrizze az fil. hegyének " -"alakját. Ha szükséges, finomítsa az érzékelő kalibrálását." +"alakját. Ha szükséges, finomítsd az érzékelő kalibrálását." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 #: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 msgid "MCU UNDERVOLTAGE VCC" -msgstr "MCU ALFESZÜLTSÉ. VCC" +msgstr "MCU VCC ALACSONY" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 @@ -2526,7 +2526,7 @@ msgstr "Anyagcserék" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 msgid "Remove the ejected filament from the front of the MMU." -msgstr "Távolítsa el a kilökött izzószálat az MMU elejéről." +msgstr "Távolítsd el a kiadott filamentet az MMU-ból." #. MSG_BTN_RESTART_MMU c=8 #: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 @@ -2539,8 +2539,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"A választó nem tud mozogni, mert a FINDA fil. észlelt. Győződjön meg arról, " -"hogy nincs fil. a választóban, és a FINDA megfelelően működik." +"A szelektor nem tud mozogni, mert a FINDA filamentet észlelt. Győződj meg arról," +"hogy nincs fil. a szelektorban, és a FINDA megfelelően működik." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2548,7 +2548,7 @@ msgid "" "The MMU firmware version incompatible with the printer's FW. Update to " "version 2.1.9." msgstr "" -"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " +"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissíts a " "2.1.9-es verzióra." #. MSG_BTN_MORE c=8 From 6bdc3c5cfb17c8168e11bb58d1df5dd8c389dace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 25 Mar 2023 09:08:14 +0000 Subject: [PATCH 079/240] Improve MMU toolchange when E-cool mode is enabled Currently we are queuing many small 2 mm E-moves until the filament sensor triggers. We do this because we never abort any queued moves, so making small 2 mm moves ensures we do not move the E-motor more than 2 mm past the filament sensor. Unfortunately, when E-cool mode is enabled, the E-motor will create audible clicking sounds (similar one hears during jam or a loose grub screw). A workaround for this is to queue one or more very long moves. Where very long is something of the order of hundreds of millimeters. I have it set to 350 mm but it's just a random constant really. Keep in mind the firmware will block too large E-moves, if I recall correctly it was anything above > 450 mm (see PREVENT_LENGTHY_EXTRUDE) In order to use very long moves, we must somehow stop the E-motor from moving once the filament sensor triggers. In other words, throw away what's left of the current E-motor move. For this simple purpose we can use planner_abort_hard() but we must set planner_aborted to false afterwards because the code architecture does not allow the main loop() to run until the Toolchange command is done processing. Change in memory: Flash: +18 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 8 +++++++- Firmware/mmu2_marlin.h | 1 + Firmware/mmu2_marlin1.cpp | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 62b46375e..8c07a3f6a 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -922,10 +922,12 @@ void MMU2::ReportError(ErrorCode ec, ErrorSource res) { switch (logic.Progress()) { case ProgressCode::UnloadingToFinda: unloadFilamentStarted = false; + planner_abort_queued_moves(); // Abort excess E-moves to be safe break; case ProgressCode::FeedingToFSensor: // FSENSOR error during load. Make sure E-motor stops moving. loadFilamentStarted = false; + planner_abort_queued_moves(); // Abort excess E-moves to be safe break; default: break; @@ -1040,6 +1042,10 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc) { case FilamentState::AT_FSENSOR: // fsensor triggered, finish FeedingToExtruder state loadFilamentStarted = false; + + // Abort any excess E-move from the planner queue + planner_abort_queued_moves(); + // After the MMU knows the FSENSOR is triggered it will: // 1. Push the filament by additional 30mm (see fsensorToNozzle) // 2. Disengage the idler and push another 2mm. @@ -1048,7 +1054,7 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc) { case FilamentState::NOT_PRESENT: // fsensor not triggered, continue moving extruder if (!planner_any_moves()) { // Only plan a move if there is no move ongoing - MoveE(2.0f, MMU2_LOAD_TO_NOZZLE_FEED_RATE); + MoveE(350.0f, MMU2_LOAD_TO_NOZZLE_FEED_RATE); } break; default: diff --git a/Firmware/mmu2_marlin.h b/Firmware/mmu2_marlin.h index 199de649e..0877a60f8 100644 --- a/Firmware/mmu2_marlin.h +++ b/Firmware/mmu2_marlin.h @@ -26,6 +26,7 @@ void MoveE(float delta, float feedRate); float MoveRaiseZ(float delta); +void planner_abort_queued_moves(); void planner_synchronize(); bool planner_any_moves(); float planner_get_machine_position_E_mm(); diff --git a/Firmware/mmu2_marlin1.cpp b/Firmware/mmu2_marlin1.cpp index 07f3c01b5..c197d2b01 100644 --- a/Firmware/mmu2_marlin1.cpp +++ b/Firmware/mmu2_marlin1.cpp @@ -18,6 +18,11 @@ float MoveRaiseZ(float delta) { return raise_z(delta); } +void planner_abort_queued_moves() { + planner_abort_hard(); + planner_aborted = false; +} + void planner_synchronize() { st_synchronize(); } From 4342217159d8c3a4f02783936b8338550d084073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 26 Mar 2023 08:54:47 +0000 Subject: [PATCH 080/240] Add comment about planner_aborted = false --- Firmware/mmu2_marlin1.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/mmu2_marlin1.cpp b/Firmware/mmu2_marlin1.cpp index c197d2b01..58ce99171 100644 --- a/Firmware/mmu2_marlin1.cpp +++ b/Firmware/mmu2_marlin1.cpp @@ -20,6 +20,12 @@ float MoveRaiseZ(float delta) { void planner_abort_queued_moves() { planner_abort_hard(); + + // Unblock the planner. This should be safe in the + // toolchange context. Currently we are mainly aborting + // excess E-moves after detecting filament during toolchange. + // If a MMU error is reported, the planner must be unblocked + // as well so the extruder can be parked safely. planner_aborted = false; } From 138654e207de678aaca01ef0831dbb79220dc8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 26 Mar 2023 09:16:07 +0000 Subject: [PATCH 081/240] Add comment Note we cannot use too long extrusions --- Firmware/mmu2.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 8c07a3f6a..e047643ef 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -1054,6 +1054,11 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc) { case FilamentState::NOT_PRESENT: // fsensor not triggered, continue moving extruder if (!planner_any_moves()) { // Only plan a move if there is no move ongoing + // Plan a very long move, where 'very long' is hundreds + // of millimeters. Keep in mind though the move can't be much longer + // than 450mm because the firmware will ignore too long extrusions + // for safety reasons. See PREVENT_LENGTHY_EXTRUDE. + // Use 350mm to be safely away from the prevention threshold MoveE(350.0f, MMU2_LOAD_TO_NOZZLE_FEED_RATE); } break; From 5be4504fea04a2a6de6743e96004dd0c574833c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 27 Mar 2023 18:14:28 +0000 Subject: [PATCH 082/240] Re-use G28 W string in PROGMEM Change in memory: Flash: -12 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 287fe3550..471906fc3 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -984,7 +984,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("G28 W")); + enquecommand_P(G28W); enquecommand_P(PSTR("G1 X125 Z200 F1000")); enquecommand_P(PSTR("M109 S280")); #ifdef TEMP_MODEL @@ -4712,7 +4712,7 @@ static void lcd_calibration_menu() { MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_first_layer_calibration_reset); } - MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W")); + MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), G28W); #ifdef TMC2130 MENU_ITEM_FUNCTION_P(_i("Belt test"), lcd_belttest_v);////MSG_BELTTEST c=18 #endif //TMC2130 From ebf8b16df56e0c3595ecccee61b912762565a77f Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 2 Apr 2023 11:35:17 +0200 Subject: [PATCH 083/240] Fix MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH for MMU2 --- Firmware/mmu2/variants/config_MMU2.h | 2 +- Firmware/mmu2/variants/config_MMU2S.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2/variants/config_MMU2.h b/Firmware/mmu2/variants/config_MMU2.h index 31ac838b1..2bbf1e3b4 100644 --- a/Firmware/mmu2/variants/config_MMU2.h +++ b/Firmware/mmu2/variants/config_MMU2.h @@ -43,7 +43,7 @@ static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE = 80.0f; // mm/s // After loading a new filament, the printer will extrude the filament by this distance // and then retract it back to the original position. This is used to check if the // filament sensor reading flickers or filament is jammed. -static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - MMU2_FILAMENT_SENSOR_POSITION; +static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK + MMU2_FILAMENT_SENSOR_POSITION; static constexpr uint8_t MMU2_NO_TOOL = 99; static constexpr uint32_t MMU_BAUD = 115200; diff --git a/Firmware/mmu2/variants/config_MMU2S.h b/Firmware/mmu2/variants/config_MMU2S.h index c5166cf55..de312ead2 100644 --- a/Firmware/mmu2/variants/config_MMU2S.h +++ b/Firmware/mmu2/variants/config_MMU2S.h @@ -43,7 +43,7 @@ static constexpr float MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE = 80.0f; // mm/s // After loading a new filament, the printer will extrude the filament by this distance // and then retract it back to the original position. This is used to check if the // filament sensor reading flickers or filament is jammed. -static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK - MMU2_FILAMENT_SENSOR_POSITION; +static constexpr float MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH = MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK + MMU2_FILAMENT_SENSOR_POSITION; static constexpr uint8_t MMU2_NO_TOOL = 99; static constexpr uint32_t MMU_BAUD = 115200; From 3e4592b7fdc2746af606396be4471055bd7371fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 27 Mar 2023 19:27:55 +0000 Subject: [PATCH 084/240] Don't duplicate silent mode menu Create a common function for the menu This saves a lot of memory and 50 lines of code! Change in memory: Flash: -110 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 97 ++++++++++--------------------------------- 1 file changed, 22 insertions(+), 75 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 471906fc3..b09854b77 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4217,52 +4217,26 @@ static void mmu_reset() MMU2::mmu2.Reset(MMU2::MMU2::ResetForm::Software); } +static void SETTINGS_SILENT_MODE() { + if (!farm_mode) { //dont show in menu if we are in farm mode #ifdef TMC2130 -#define SETTINGS_SILENT_MODE \ -do\ -{\ - if(!farm_mode)\ - {\ - if (SilentModeMenu == SILENT_MODE_NORMAL)\ - {\ - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set);\ - }\ - else MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set);\ - if (SilentModeMenu == SILENT_MODE_NORMAL)\ - {\ - if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);\ - else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch);\ - }\ - else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info);\ - }\ -}\ -while (0) - + if (eeprom_read_byte((uint8_t*)EEPROM_SILENT) == SILENT_MODE_NORMAL) { + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); + MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), lcd_crash_detect_enabled() ? _T(MSG_ON) : _T(MSG_OFF), crash_mode_switch); + } else { + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); + MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); + } #else //TMC2130 -#define SETTINGS_SILENT_MODE \ -do\ -{\ - if(!farm_mode)\ - {\ - switch (SilentModeMenu)\ - {\ - case SILENT_MODE_POWER:\ - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ - break;\ - case SILENT_MODE_SILENT:\ - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set);\ - break;\ - case SILENT_MODE_AUTO:\ - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set);\ - break;\ - default:\ - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ - break; /* (probably) not needed*/\ - }\ - }\ -}\ -while (0) + switch (eeprom_read_byte((uint8_t*)EEPROM_SILENT)) { + case SILENT_MODE_POWER: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; + case SILENT_MODE_SILENT: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); break; + case SILENT_MODE_AUTO: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); break; + default: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; // (probably) not needed + } #endif //TMC2130 + } +} #ifndef MMU_FORCE_STEALTH_MODE #define SETTINGS_MMU_MODE \ @@ -4610,9 +4584,8 @@ static void lcd_settings_menu() MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), mmu_reset); } - MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); - - SETTINGS_SILENT_MODE; + MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + SETTINGS_SILENT_MODE(); if(!farm_mode) { @@ -5600,35 +5573,9 @@ static void lcd_tune_menu() SETTINGS_CUTTER; } - MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); - - -#ifdef TMC2130 - if(!farm_mode) - { - if (SilentModeMenu == SILENT_MODE_NORMAL) { - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); - if (lcd_crash_detect_enabled()) { - MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch); - } else { - MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch); - } - } else { - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); - MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); - } - } -#else //TMC2130 - if (!farm_mode) { //dont show in menu if we are in farm mode - switch (SilentModeMenu) { - case SILENT_MODE_POWER: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; - case SILENT_MODE_SILENT: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); break; - case SILENT_MODE_AUTO: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); break; - default: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; // (probably) not needed - } - } -#endif //TMC2130 - SETTINGS_MMU_MODE; + MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + SETTINGS_SILENT_MODE(); + SETTINGS_MMU_MODE; SETTINGS_SOUND; #ifdef LCD_BL_PIN if (backlightSupport) From b7c42e83cffd8928e41e85353d3590497946fd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 25 Mar 2023 22:31:29 +0000 Subject: [PATCH 085/240] Fix a few ambiguous overloaded calls Noticed this when exploring another optimisation By specification exactly which overloaded function to use we save some memory Seems to have something to do with doing arithmetic in the function argument Change in memory: Flash: -156 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8120770f5..d93a853e8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3456,7 +3456,7 @@ static void mmu_M600_unload_filament() { lcd_clear(); lcd_puts_at_P(0, 1, _T(MSG_UNLOADING_FILAMENT)); lcd_print(' '); - lcd_print(MMU2::mmu2.get_current_tool() + 1); + lcd_print(uint8_t(MMU2::mmu2.get_current_tool() + 1)); // unload just current filament for multimaterial printers (used also in M702) MMU2::mmu2.unload(); diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 87615b56e..750f70dde 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -320,7 +320,7 @@ static void FullScreenMsg(const char *pgmS, uint8_t slot){ lcd_clear(); lcd_puts_at_P(0, 1, pgmS); lcd_print(' '); - lcd_print(slot + 1); + lcd_print(uint8_t(slot + 1)); } void FullScreenMsgCut(uint8_t slot){ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b09854b77..fc47959eb 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -583,7 +583,7 @@ void lcdui_print_status_line(void) { lcd_space(LCD_WIDTH); lcd_puts_at_P(0, 3, _T(MSG_CALIBRATE_Z_AUTO)); lcd_puts_P(PSTR(" : ")); - lcd_print(custom_message_state - 10); + lcd_print(uint8_t(custom_message_state - 10)); } else { if (custom_message_state == 3) { lcd_setstatuspgm(MSG_WELCOME); @@ -4796,7 +4796,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite for (uint_least8_t i = 0; i < ordinary_items; i++) { lcd_set_cursor(2 + item_len, i+1); - lcd_print(first + i + 1); + lcd_print(uint8_t(first + i + 1)); } if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item); From c0e21563e73c6b1646ed12cfccce8fb0931e12c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 8 Mar 2023 22:05:04 +0000 Subject: [PATCH 086/240] planner: optimise acceleration limits Rename acceleration_st to acceleration_steps_per_s2 to be same as Marlin 2 Store the accelerator in local variable accel while we are performing the limit checks. When limit checks are done we can assign the block it's acceleration. Especially block->acceleration_steps_per_s2 is now only written to once, instead of direcly in the limit checks. Change in memory: Flash: -118 bytes SRAM: 0 bytes --- Firmware/planner.cpp | 52 +++++++++++++++----------------------------- Firmware/planner.h | 8 +++---- 2 files changed, 22 insertions(+), 38 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index e22f82860..c854cd7ee 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -207,7 +207,7 @@ void calculate_trapezoid_for_block(block_t *block, float entry_speed, float exit if (final_rate > block->nominal_rate) final_rate = block->nominal_rate; - uint32_t acceleration = block->acceleration_st; + uint32_t acceleration = block->acceleration_steps_per_s2; if (acceleration == 0) // Don't allow zero acceleration. acceleration = 1; @@ -1008,17 +1008,17 @@ Having the real displacement of the head, we can calculate the total movement le // block->step_event_count ... event count of the fastest axis // block->millimeters ... Euclidian length of the XYZ movement or the E length, if no XYZ movement. float steps_per_mm = block->step_event_count.wide/block->millimeters; + uint32_t accel; if(block->steps_x.wide == 0 && block->steps_y.wide == 0 && block->steps_z.wide == 0) { - block->acceleration_st = ceil(cs.retract_acceleration * steps_per_mm); // convert to: acceleration steps/sec^2 + accel = ceil(cs.retract_acceleration * steps_per_mm); // convert to: acceleration steps/sec^2 #ifdef LIN_ADVANCE block->use_advance_lead = false; #endif } else { - float acceleration = (block->steps_e.wide == 0? cs.travel_acceleration: cs.acceleration); - block->acceleration_st = ceil(acceleration * steps_per_mm); // convert to: acceleration steps/sec^2 + accel = ceil((block->steps_e.wide ? cs.acceleration : cs.travel_acceleration) * steps_per_mm); // convert to: acceleration steps/sec^2 #ifdef LIN_ADVANCE /** @@ -1054,9 +1054,9 @@ Having the real displacement of the head, we can calculate the total movement le if (e_D_ratio > 3.0) block->use_advance_lead = false; else if (e_D_ratio > 0) { - const float max_accel_per_s2 = cs.max_jerk[E_AXIS] / (extruder_advance_K * e_D_ratio); - if (cs.acceleration > max_accel_per_s2) { - block->acceleration_st = ceil(max_accel_per_s2 * steps_per_mm); + const float max_accel_per_s2 = cs.max_jerk[E_AXIS] / (extruder_advance_K * e_D_ratio) * steps_per_mm; + if (accel > max_accel_per_s2) { + accel = ceil(max_accel_per_s2); #ifdef LA_DEBUG SERIAL_ECHOLNPGM("LA: Block acceleration limited due to max E-jerk"); #endif @@ -1067,35 +1067,19 @@ Having the real displacement of the head, we can calculate the total movement le // Limit acceleration per axis //FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit. - if(((float)block->acceleration_st * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) - { block->acceleration_st = axis_steps_per_sqr_second[X_AXIS]; } - if(((float)block->acceleration_st * (float)block->steps_y.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Y_AXIS]) - { block->acceleration_st = axis_steps_per_sqr_second[Y_AXIS]; } - if(((float)block->acceleration_st * (float)block->steps_e.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[E_AXIS]) - { block->acceleration_st = axis_steps_per_sqr_second[E_AXIS]; } - if(((float)block->acceleration_st * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > axis_steps_per_sqr_second[Z_AXIS]) - { block->acceleration_st = axis_steps_per_sqr_second[Z_AXIS]; } + if(((float)accel * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) + { accel = axis_steps_per_sqr_second[X_AXIS]; } + if(((float)accel * (float)block->steps_y.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Y_AXIS]) + { accel = axis_steps_per_sqr_second[Y_AXIS]; } + if(((float)accel * (float)block->steps_e.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[E_AXIS]) + { accel = axis_steps_per_sqr_second[E_AXIS]; } + if(((float)accel * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > axis_steps_per_sqr_second[Z_AXIS]) + { accel = axis_steps_per_sqr_second[Z_AXIS]; } } // Acceleration of the segment, in mm/sec^2 - block->acceleration = block->acceleration_st / steps_per_mm; - -#if 0 - // Oversample diagonal movements by a power of 2 up to 8x - // to achieve more accurate diagonal movements. - uint8_t bresenham_oversample = 1; - for (uint8_t i = 0; i < 3; ++ i) { - if (block->nominal_rate >= 5000) // 5kHz - break; - block->nominal_rate << 1; - bresenham_oversample << 1; - block->step_event_count << 1; - } - if (bresenham_oversample > 1) - // Lower the acceleration steps/sec^2 to account for the oversampling. - block->acceleration_st = (block->acceleration_st + (bresenham_oversample >> 1)) / bresenham_oversample; -#endif - - block->acceleration_rate = ((float)block->acceleration_st * (16777216.0 / (F_CPU / 8.0))); + block->acceleration_steps_per_s2 = accel; + block->acceleration = accel / steps_per_mm; + block->acceleration_rate = (uint32_t)(accel * (float(1UL << 24) / ((F_CPU) / 8.0f))); // Start with a safe speed. // Safe speed is the speed, from which the machine may halt to stop immediately. diff --git a/Firmware/planner.h b/Firmware/planner.h index ef15be6e3..5c4828146 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -99,10 +99,10 @@ typedef struct { // Settings for the trapezoid generator (runs inside an interrupt handler). // Changing the following values in the planner needs to be synchronized with the interrupt handler by disabling the interrupts. - unsigned long nominal_rate; // The nominal step rate for this block in step_events/sec - unsigned long initial_rate; // The jerk-adjusted step rate at start of block - unsigned long final_rate; // The minimal rate at exit - unsigned long acceleration_st; // acceleration steps/sec^2 + uint32_t nominal_rate; // The nominal step rate for this block in step_events/sec + uint32_t initial_rate; // The jerk-adjusted step rate at start of block + uint32_t final_rate; // The minimal rate at exit + uint32_t acceleration_steps_per_s2; // acceleration steps/sec^2 //FIXME does it have to be int? Probably uint8_t would be just fine. Need to change in other places as well int fan_speed; volatile char busy; From 65750b9a4caebe2faae103fdc1b054d420eb2360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 8 Mar 2023 23:32:57 +0000 Subject: [PATCH 087/240] accel is uint32_t, drop float in comparsion Change in memory: Flash: -24 bytes SRAM: 0 bytes --- Firmware/planner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index c854cd7ee..c49d26f7b 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -1054,9 +1054,9 @@ Having the real displacement of the head, we can calculate the total movement le if (e_D_ratio > 3.0) block->use_advance_lead = false; else if (e_D_ratio > 0) { - const float max_accel_per_s2 = cs.max_jerk[E_AXIS] / (extruder_advance_K * e_D_ratio) * steps_per_mm; - if (accel > max_accel_per_s2) { - accel = ceil(max_accel_per_s2); + const uint32_t max_accel_steps_per_s2 = ceil(cs.max_jerk[E_AXIS] / (extruder_advance_K * e_D_ratio) * steps_per_mm); + if (accel > max_accel_steps_per_s2) { + accel = max_accel_steps_per_s2; #ifdef LA_DEBUG SERIAL_ECHOLNPGM("LA: Block acceleration limited due to max E-jerk"); #endif From b9fecab2398a67102f1323757060670bb2535c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 21 Mar 2023 22:47:05 +0000 Subject: [PATCH 088/240] Reduce calls to __divsf3 when calculating feedrate For non-time critical code it is more effcient to call a function rather inlining each division operation. Change in memory: Flash: -122 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 5 +++++ Firmware/Marlin_main.cpp | 32 ++++++++++++++++++++------------ Firmware/ultralcd.cpp | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 1cef467d6..53f415b9d 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -287,6 +287,11 @@ void prepare_move(uint16_t start_segment_idx = 0); void prepare_arc_move(bool isclockwise, uint16_t start_segment_idx = 0); uint16_t restore_interrupted_gcode(); +///@brief Helper function to reduce code size, cheaper to call function than to inline division +///@param feedrate_mm_min feedrate with unit mm per minute +///@returns feedrate with unit mm per second +float __attribute__((noinline)) get_feedrate_mm_s(const float feedrate_mm_min); + #ifdef TMC2130 void homeaxis(uint8_t axis, uint8_t cnt = 1, uint8_t* pstep = 0); #else diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d93a853e8..50453ae07 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2217,6 +2217,10 @@ static void check_Z_crash(void) } #endif //TMC2130 +float __attribute__((noinline)) get_feedrate_mm_s(const float feedrate_mm_min) { + return feedrate_mm_min / 60.f; +} + #ifdef TMC2130 void homeaxis(uint8_t axis, uint8_t cnt, uint8_t* pstep) #else @@ -2230,6 +2234,7 @@ void homeaxis(uint8_t axis, uint8_t cnt) { int axis_home_dir = home_dir(axis); feedrate = homing_feedrate[axis]; + float feedrate_mm_s = get_feedrate_mm_s(feedrate); #ifdef TMC2130 tmc2130_home_enter(X_AXIS_MASK << axis); @@ -2244,7 +2249,7 @@ void homeaxis(uint8_t axis, uint8_t cnt) set_destination_to_current(); // destination[axis] = 11.f; destination[axis] = -3.f * axis_home_dir; - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); // Move away from the possible collision with opposite endstop with the collision detection disabled. endstops_hit_on_purpose(); @@ -2252,12 +2257,12 @@ void homeaxis(uint8_t axis, uint8_t cnt) current_position[axis] = 0; plan_set_position_curposXYZE(); destination[axis] = 1. * axis_home_dir; - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); // Now continue to move up to the left end stop with the collision detection enabled. enable_endstops(true); destination[axis] = 1.1 * axis_home_dir * max_length(axis); - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); for (uint8_t i = 0; i < cnt; i++) { @@ -2267,7 +2272,7 @@ void homeaxis(uint8_t axis, uint8_t cnt) current_position[axis] = 0; plan_set_position_curposXYZE(); destination[axis] = -10.f * axis_home_dir; - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); endstops_hit_on_purpose(); // Now move left up to the collision, this time with a repeatable velocity. @@ -2277,8 +2282,9 @@ void homeaxis(uint8_t axis, uint8_t cnt) feedrate = homing_feedrate[axis]; #else //TMC2130 feedrate = homing_feedrate[axis] / 2; + feedrate_mm_s = get_feedrate_mm_s(feedrate); #endif //TMC2130 - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); #ifdef TMC2130 uint16_t mscnt = tmc2130_rd_MSCNT(axis); @@ -2315,7 +2321,7 @@ void homeaxis(uint8_t axis, uint8_t cnt) plan_set_position_curposXYZE(); current_position[axis] += dist; destination[axis] = current_position[axis]; - plan_buffer_line_destinationXYZE(0.5f*feedrate/60); + plan_buffer_line_destinationXYZE(0.5f*feedrate_mm_s); st_synchronize(); feedrate = 0.0; @@ -2330,7 +2336,8 @@ void homeaxis(uint8_t axis, uint8_t cnt) plan_set_position_curposXYZE(); destination[axis] = 1.5 * max_length(axis) * axis_home_dir; feedrate = homing_feedrate[axis]; - plan_buffer_line_destinationXYZE(feedrate/60); + float feedrate_mm_s = get_feedrate_mm_s(feedrate); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); #ifdef TMC2130 check_Z_crash(); @@ -2338,11 +2345,12 @@ void homeaxis(uint8_t axis, uint8_t cnt) current_position[axis] = 0; plan_set_position_curposXYZE(); destination[axis] = -home_retract_mm(axis) * axis_home_dir; - plan_buffer_line_destinationXYZE(feedrate/60); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); destination[axis] = 2*home_retract_mm(axis) * axis_home_dir; - feedrate = homing_feedrate[axis]/2 ; - plan_buffer_line_destinationXYZE(feedrate/60); + feedrate = homing_feedrate[axis] / 2; + feedrate_mm_s = get_feedrate_mm_s(feedrate); + plan_buffer_line_destinationXYZE(feedrate_mm_s); st_synchronize(); #ifdef TMC2130 check_Z_crash(); @@ -6888,7 +6896,7 @@ Sigma_Exit: } if(code_seen('F')) { - cs.retract_feedrate = code_value()/60 ; + cs.retract_feedrate = get_feedrate_mm_s(code_value()); } if(code_seen('Z')) { @@ -6914,7 +6922,7 @@ Sigma_Exit: } if(code_seen('F')) { - cs.retract_recover_feedrate = code_value()/60 ; + cs.retract_recover_feedrate = get_feedrate_mm_s(code_value()); } }break; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index fc47959eb..dab05eb25 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2420,7 +2420,7 @@ static void _lcd_move(const char *name, uint8_t axis, int min, int max) if (max_software_endstops && current_position[axis] > max) current_position[axis] = max; lcd_encoder = 0; world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); - plan_buffer_line_curposXYZE(manual_feedrate[axis] / 60); + plan_buffer_line_curposXYZE(get_feedrate_mm_s(manual_feedrate[axis])); lcd_draw_update = 1; } } From 478627b6bc368fc564691dcbd19a7d9d14b175cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 3 Dec 2022 11:50:12 +0000 Subject: [PATCH 089/240] Simplify parsing M862 This gets rid of float conversion. We just need to check the 6th character when M862 is detected. This character gives us the digit after the dot. Change in memory: Flash: -20 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 50453ae07..e0f9462a0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8021,10 +8021,9 @@ Sigma_Exit: */ case 862: // M862: print checking - float nDummy; - uint8_t nCommand; - nCommand=(uint8_t)(modff(code_value(),&nDummy)*10.0+0.5); - switch((ClPrintChecking)nCommand) + { + ClPrintChecking nCommand = static_cast(strtol(strchr_pointer+5, NULL, 10)); + switch(nCommand) { case ClPrintChecking::_Nozzle: // ~ .1 uint16_t nDiameter; @@ -8074,7 +8073,8 @@ Sigma_Exit: SERIAL_PROTOCOLLN(GCODE_LEVEL); break; } - break; + break; + } #ifdef LIN_ADVANCE /*! From 46852e99414458bee1f78e2c572e2d5d856011c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 21 Jan 2023 16:33:35 +0000 Subject: [PATCH 090/240] M862: determine decimal through math rather than checking for null byte/pointer. This way doesn't add any more flash memory. Calculating the string length or checking for a null byte will end up increasing flash consumption overall. --- Firmware/Marlin_main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e0f9462a0..2af7038bf 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8022,7 +8022,9 @@ Sigma_Exit: */ case 862: // M862: print checking { - ClPrintChecking nCommand = static_cast(strtol(strchr_pointer+5, NULL, 10)); + // Read the decimal by multiplying the float value by 10 e.g. 862.1 becomes 8621 + // This method consumes less flash memory compared to checking the string length. + ClPrintChecking nCommand = static_cast((uint16_t)(code_value()*10) - 8620u); switch(nCommand) { case ClPrintChecking::_Nozzle: // ~ .1 From 4cf46893fcebd65657b529a610e12cb32a44df2a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 4 Apr 2023 16:12:41 +0200 Subject: [PATCH 091/240] Revert "Fix a few ambiguous overloaded calls" This reverts commit b7c42e83cffd8928e41e85353d3590497946fd91. --- Firmware/Marlin_main.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2af7038bf..4486c7322 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3464,7 +3464,7 @@ static void mmu_M600_unload_filament() { lcd_clear(); lcd_puts_at_P(0, 1, _T(MSG_UNLOADING_FILAMENT)); lcd_print(' '); - lcd_print(uint8_t(MMU2::mmu2.get_current_tool() + 1)); + lcd_print(MMU2::mmu2.get_current_tool() + 1); // unload just current filament for multimaterial printers (used also in M702) MMU2::mmu2.unload(); diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 750f70dde..87615b56e 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -320,7 +320,7 @@ static void FullScreenMsg(const char *pgmS, uint8_t slot){ lcd_clear(); lcd_puts_at_P(0, 1, pgmS); lcd_print(' '); - lcd_print(uint8_t(slot + 1)); + lcd_print(slot + 1); } void FullScreenMsgCut(uint8_t slot){ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dab05eb25..0f1b7ac06 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -583,7 +583,7 @@ void lcdui_print_status_line(void) { lcd_space(LCD_WIDTH); lcd_puts_at_P(0, 3, _T(MSG_CALIBRATE_Z_AUTO)); lcd_puts_P(PSTR(" : ")); - lcd_print(uint8_t(custom_message_state - 10)); + lcd_print(custom_message_state - 10); } else { if (custom_message_state == 3) { lcd_setstatuspgm(MSG_WELCOME); @@ -4796,7 +4796,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite for (uint_least8_t i = 0; i < ordinary_items; i++) { lcd_set_cursor(2 + item_len, i+1); - lcd_print(uint8_t(first + i + 1)); + lcd_print(first + i + 1); } if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item); From 687c14808a86416b1dfe6786cc700ba6712cad00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 20:14:06 +0000 Subject: [PATCH 092/240] optimisation: MMU silent mode toggling & init Change in memory: Flash: -16 bytes SRAM: -2 bytes --- Firmware/Marlin_main.cpp | 6 +----- Firmware/ultralcd.cpp | 10 +++------- Firmware/ultralcd.h | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4486c7322..b6e00929a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1465,11 +1465,7 @@ void setup() //mbl_mode_init(); mbl_settings_init(); - SilentModeMenu_MMU = eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH); - if (SilentModeMenu_MMU == 255) { - SilentModeMenu_MMU = 1; - eeprom_write_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); - } + eeprom_init_default_byte((uint8_t*)EEPROM_MMU_STEALTH, 1); #if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 setup_fan_interrupt(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0f1b7ac06..cf1938bac 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -61,7 +61,6 @@ int8_t ReInitLCD = 0; uint8_t scrollstuff = 0; int8_t SilentModeMenu = SILENT_MODE_OFF; -uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode int8_t FSensorStateMenu = 1; @@ -3442,10 +3441,8 @@ Sound_CycleState(); } #ifndef MMU_FORCE_STEALTH_MODE -static void lcd_silent_mode_mmu_set() { - if (SilentModeMenu_MMU == 1) SilentModeMenu_MMU = 0; - else SilentModeMenu_MMU = 1; - //saving to eeprom is done in mmu_loop() after mmu actually switches state and confirms with "ok" +static void lcd_mmu_mode_toggle() { + eeprom_toggle((uint8_t*)EEPROM_MMU_STEALTH); } #endif //MMU_FORCE_STEALTH_MODE @@ -4244,8 +4241,7 @@ do\ {\ if (MMU2::mmu2.Enabled())\ {\ - if (SilentModeMenu_MMU == 0) MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), _T(MSG_NORMAL), lcd_silent_mode_mmu_set);\ - else MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), _T(MSG_STEALTH), lcd_silent_mode_mmu_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) ? _T(MSG_STEALTH) : _T(MSG_NORMAL), lcd_mmu_mode_toggle);\ }\ }\ while (0) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index b398f6a91..d520be5d6 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -163,7 +163,6 @@ void printf_IRSensorAnalogBoardChange(); #endif //IR_SENSOR_ANALOG extern int8_t SilentModeMenu; -extern uint8_t SilentModeMenu_MMU; extern bool cancel_heatup; extern bool isPrintPaused; From 7e119f733fba284dd85c5d5cf4ee41229d64bb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 28 Feb 2023 21:33:17 +0000 Subject: [PATCH 093/240] Implement variant of enquecommand which accepts format string This eliminates many local buffers Change in memory: Flash: -450 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 62 ++++++++++++-------------------------- Firmware/cardreader.cpp | 4 +-- Firmware/cmdqueue.cpp | 14 +++++++++ Firmware/cmdqueue.h | 4 +++ Firmware/first_lay_cal.cpp | 54 +++++++++------------------------ Firmware/first_lay_cal.h | 2 +- Firmware/ultralcd.cpp | 11 ++----- 7 files changed, 57 insertions(+), 94 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4486c7322..4d2443dc5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3594,10 +3594,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float // Recover feed rate feedmultiply = feedmultiplyBckp; - char cmd[9]; - sprintf_P(cmd, MSG_M220, feedmultiplyBckp); - enquecommand(cmd); - + enquecommandf(MSG_M220, feedmultiplyBckp); } lcd_setstatuspgm(MSG_WELCOME); @@ -10768,7 +10765,6 @@ ISR(INT4_vect) { } void recover_print(uint8_t automatic) { - char cmd[30]; lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(_i("Recovering print"));////MSG_RECOVERING_PRINT c=20 @@ -10780,21 +10776,16 @@ void recover_print(uint8_t automatic) { // and second also so one may remove the excess priming material. if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { - sprintf_P(cmd, PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); - enquecommand(cmd); + enquecommandf(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); } // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine // transformation status. G28 will not touch Z when MBL is off. enquecommand_P(PSTR("G28 X Y")); // Set the target bed and nozzle temperatures and wait. - sprintf_P(cmd, PSTR("M104 S%d"), target_temperature[active_extruder]); - enquecommand(cmd); - sprintf_P(cmd, PSTR("M140 S%d"), target_temperature_bed); - enquecommand(cmd); - sprintf_P(cmd, PSTR("M109 S%d"), target_temperature[active_extruder]); - enquecommand(cmd); - + enquecommandf(PSTR("M104 S%d"), target_temperature[active_extruder]); + enquecommandf(PSTR("M140 S%d"), target_temperature_bed); + enquecommandf(PSTR("M109 S%d"), target_temperature[active_extruder]); enquecommand_P(MSG_M83); //E axis relative mode // If not automatically recoreverd (long power loss) @@ -10802,8 +10793,7 @@ void recover_print(uint8_t automatic) { //Extrude some filament to stabilize the pressure enquecommand_P(PSTR("G1 E5 F120")); // Retract to be consistent with a short pause - sprintf_P(cmd, G1_E_F2700, default_retraction); - enquecommand(cmd); + enquecommandf(G1_E_F2700, default_retraction); } printf_P(_N("After waiting for temp:\nCurrent pos X_AXIS:%.3f\nCurrent pos Y_AXIS:%.3f\n"), current_position[X_AXIS], current_position[Y_AXIS]); @@ -10894,7 +10884,6 @@ void restore_print_from_eeprom(bool mbl_was_active) { int feedrate_rec; int feedmultiply_rec; uint8_t fan_speed_rec; - char cmd[48]; char filename[FILENAME_LENGTH]; uint8_t depth = 0; char dir_name[9]; @@ -10926,9 +10915,8 @@ void restore_print_from_eeprom(bool mbl_was_active) { filename[8] = '\0'; MYSERIAL.print(filename); - strcat_P(filename, PSTR(".gco")); - sprintf_P(cmd, MSG_M23, filename); - enquecommand(cmd); + strcat_P(filename, PSTR(".gco")); + enquecommandf(MSG_M23, filename); uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); MYSERIAL.println(position); @@ -10939,8 +10927,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { float pos_y = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); if (pos_x != X_COORD_INVALID) { - sprintf_P(cmd, PSTR("G1 X%f Y%f F3000"), pos_x, pos_y); - enquecommand(cmd); + enquecommandf(PSTR("G1 X%f Y%f F3000"), pos_x, pos_y); } // Enable MBL and switch to logical positioning @@ -10948,37 +10935,29 @@ void restore_print_from_eeprom(bool mbl_was_active) { enquecommand_P(PSTR("PRUSA MBL V1")); // Move the Z axis down to the print, in logical coordinates. - sprintf_P(cmd, PSTR("G1 Z%f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); - enquecommand(cmd); + enquecommandf(PSTR("G1 Z%f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); // Restore acceleration settings float acceleration = eeprom_read_float((float*)(EEPROM_UVLO_ACCELL)); float retract_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_RETRACT_ACCELL)); float travel_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL)); - sprintf_P(cmd, PSTR("M204 P%f R%f T%f"), acceleration, retract_acceleration, travel_acceleration); - enquecommand(cmd); + enquecommandf(PSTR("M204 P%f R%f T%f"), acceleration, retract_acceleration, travel_acceleration); // Unretract. - sprintf_P(cmd, G1_E_F2700, default_retraction); - enquecommand(cmd); + enquecommandf(G1_E_F2700, default_retraction); // Recover final E axis position and mode float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - sprintf_P(cmd, PSTR("G92 E%6.3f"), pos_e); - enquecommand(cmd); + enquecommandf(PSTR("G92 E%6.3f"), pos_e); if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) enquecommand_P(PSTR("M82")); //E axis abslute mode // Set the feedrates saved at the power panic. - sprintf_P(cmd, PSTR("G1 F%d"), feedrate_rec); - enquecommand(cmd); - sprintf_P(cmd, MSG_M220, feedmultiply_rec); - enquecommand(cmd); + enquecommandf(PSTR("G1 F%d"), feedrate_rec); + enquecommandf(MSG_M220, feedmultiply_rec); // Set the fan speed saved at the power panic. - sprintf_P(cmd, PSTR("M106 S%u"), fan_speed_rec); - enquecommand(cmd); + enquecommandf(PSTR("M106 S%u"), fan_speed_rec); // Set a position in the file. - sprintf_P(cmd, PSTR("M26 S%lu"), position); - enquecommand(cmd); + enquecommandf(PSTR("M26 S%lu"), position); enquecommand_P(PSTR("G4 S0")); enquecommand_P(PSTR("PRUSA uvlo")); } @@ -11149,7 +11128,6 @@ void stop_and_save_print_to_ram(float z_move, float e_move) // Rather than calling plan_buffer_line directly, push the move into the command queue so that // the caller can continue processing. This is used during powerpanic to save the state as we // move away from the print. - char buf[48]; if(e_move) { @@ -11163,15 +11141,13 @@ void stop_and_save_print_to_ram(float z_move, float e_move) // A snprintf would have been a safer call, but since it is not used // in the whole program, its implementation would bring more bytes to the total size // The behavior of dtostrf 8,3 should be roughly the same as %-0.3 - sprintf_P(buf, G1_E_F2700, e_move); - enquecommand(buf, false); + enquecommandf(G1_E_F2700, e_move); } if(z_move) { // Then lift Z axis - sprintf_P(buf, PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); - enquecommand(buf, false); + enquecommandf(PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); } // If this call is invoked from the main Arduino loop() function, let the caller know that the command diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index f91f05b52..866a8eff4 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -649,10 +649,8 @@ void CardReader::checkautostart(bool force) if(p.name[9]!='~') //skip safety copies if(strncmp((char*)p.name,autoname,5)==0) { - char cmd[30]; // M23: Select SD file - sprintf_P(cmd, MSG_M23, autoname); - enquecommand(cmd); + enquecommandf(MSG_M23, autoname); // M24: Start/resume SD print enquecommand_P(MSG_M24); found=true; diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index cd5a3c348..98a013b37 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -1,3 +1,4 @@ +#include #include #include "cmdqueue.h" #include "cardreader.h" @@ -251,6 +252,19 @@ void cmdqueue_dump_to_serial() static const char bufferFull[] PROGMEM = "\" failed: Buffer full!"; static const char enqueingFront[] PROGMEM = "Enqueing to the front: \""; + +void enquecommandf(const char *fmt, ...) +{ + // MAX_CMD_SIZE is 96, but for formatting + // string we usually don't need more than 30 bytes + char cmd_buffer[30]; + va_list ap; + va_start(ap, fmt); + vsnprintf_P(cmd_buffer, sizeof(cmd_buffer), fmt, ap); + va_end(ap); + + enquecommand(cmd_buffer, false); +} //adds an command to the main command buffer //thats really done in a non-safe way. //needs overworking someday diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 2ea684529..6c7b7a739 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -61,6 +61,10 @@ extern void cmdqueue_dump_to_serial_single_line(int nr, const char *p); extern void cmdqueue_dump_to_serial(); #endif /* CMDBUFFER_DEBUG */ extern bool cmd_buffer_empty(); + +/// @brief Variant of enquecommand which accepts a format string +/// @param fmt a format string residing in PROGMEM +void enquecommandf(const char *fmt, ...); extern void enquecommand(const char *cmd, bool from_progmem = false); extern void enquecommand_front(const char *cmd, bool from_progmem = false); extern void repeatcommand_front(); diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 87d94c55c..84641ac32 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -58,7 +58,7 @@ void lay1cal_wait_preheat() //! @param cmd_buffer character buffer needed to format gcodes //! @param filament filament to use (applies for MMU only) //! @returns true if extra purge distance is needed in case of MMU prints (after a toolchange), otherwise false -bool lay1cal_load_filament(char *cmd_buffer, uint8_t filament) +bool lay1cal_load_filament(uint8_t filament) { if (MMU2::mmu2.Enabled()) { @@ -75,13 +75,7 @@ bool lay1cal_load_filament(char *cmd_buffer, uint8_t filament) enquecommand_P(MSG_M702_NO_LIFT); } // perform a toolchange - // sprintf_P(cmd_buffer, PSTR("T%d"), filament); - // rewriting the trivial T g-code command saves 30B: - cmd_buffer[0] = 'T'; - cmd_buffer[1] = filament + '0'; - cmd_buffer[2] = 0; - - enquecommand(cmd_buffer); + enquecommandf(PSTR("T%d"), filament); return true; } return false; @@ -128,12 +122,9 @@ void lay1cal_intro_line(bool extraPurgeNeeded, float layer_height, float extrusi } else { - char cmd_buffer[30]; static const char fmt1[] PROGMEM = "G1 X%d E%-.3f F1000"; - sprintf_P(cmd_buffer, fmt1, 60, count_e(layer_height, extrusion_width * 4.f, 60)); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, fmt1, 100, count_e(layer_height, extrusion_width * 8.f, 40)); - enquecommand(cmd_buffer); + enquecommandf(fmt1, 60, count_e(layer_height, extrusion_width * 4.f, 60)); + enquecommandf(fmt1, 100, count_e(layer_height, extrusion_width * 8.f, 40)); } } @@ -166,31 +157,23 @@ void lay1cal_before_meander() //! @brief Print meander start void lay1cal_meander_start(float layer_height, float extrusion_width) { - char cmd_buffer[30]; enquecommand_P(PSTR("G1 X50 Y155")); static const char fmt1[] PROGMEM = "G1 Z%-.3f F7200"; - sprintf_P(cmd_buffer, fmt1, layer_height); - enquecommand(cmd_buffer); + enquecommandf(fmt1, layer_height); enquecommand_P(PSTR("G1 F1080")); - sprintf_P(cmd_buffer, extrude_fmt, 75, 155, count_e(layer_height, extrusion_width * 4.f, 25)); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, extrude_fmt, 100, 155, count_e(layer_height, extrusion_width * 2.f, 25)); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, extrude_fmt, 200, 155, count_e(layer_height, extrusion_width, 100)); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, extrude_fmt, 200, 135, count_e(layer_height, extrusion_width, 20)); - enquecommand(cmd_buffer); + enquecommandf(extrude_fmt, 75, 155, count_e(layer_height, extrusion_width * 4.f, 25)); + enquecommandf(extrude_fmt, 100, 155, count_e(layer_height, extrusion_width * 2.f, 25)); + enquecommandf(extrude_fmt, 200, 155, count_e(layer_height, extrusion_width, 100)); + enquecommandf(extrude_fmt, 200, 135, count_e(layer_height, extrusion_width, 20)); } //! @brief Print meander //! @param cmd_buffer character buffer needed to format gcodes void lay1cal_meander(float layer_height, float extrusion_width) { - char cmd_buffer[30]; - const float short_length = 20; float long_length = 150; const float long_extrusion = count_e(layer_height, extrusion_width, long_length); @@ -200,13 +183,11 @@ void lay1cal_meander(float layer_height, float extrusion_width) uint8_t x_pos = 50; for(uint8_t i = 0; i <= 4; ++i) { - sprintf_P(cmd_buffer, extrude_fmt, x_pos, y_pos, long_extrusion); - enquecommand(cmd_buffer); + enquecommandf(extrude_fmt, x_pos, y_pos, long_extrusion); y_pos -= short_length; - sprintf_P(cmd_buffer, extrude_fmt, x_pos, y_pos, short_extrusion); - enquecommand(cmd_buffer); + enquecommandf(extrude_fmt, x_pos, y_pos, short_extrusion); x_pos += long_length; @@ -223,7 +204,6 @@ void lay1cal_meander(float layer_height, float extrusion_width) //! @param i iteration void lay1cal_square(uint8_t step, float layer_height, float extrusion_width) { - char cmd_buffer[30]; const float long_length = 20; const float short_length = spacing(layer_height, extrusion_width); const float long_extrusion = count_e(layer_height, extrusion_width, long_length); @@ -232,14 +212,10 @@ void lay1cal_square(uint8_t step, float layer_height, float extrusion_width) for (uint8_t i = step; i < step+4; ++i) { - sprintf_P(cmd_buffer, fmt1, 70, (35 - i*short_length * 2), long_extrusion); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, fmt1, 70, (35 - (2 * i + 1)*short_length), short_extrusion); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, fmt1, 50, (35 - (2 * i + 1)*short_length), long_extrusion); - enquecommand(cmd_buffer); - sprintf_P(cmd_buffer, fmt1, 50, (35 - (i + 1)*short_length * 2), short_extrusion); - enquecommand(cmd_buffer); + enquecommandf(fmt1, 70, (35 - i*short_length * 2), long_extrusion); + enquecommandf(fmt1, 70, (35 - (2 * i + 1)*short_length), short_extrusion); + enquecommandf(fmt1, 50, (35 - (2 * i + 1)*short_length), long_extrusion); + enquecommandf(fmt1, 50, (35 - (i + 1)*short_length * 2), short_extrusion); } } diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 4580163b7..1e2dd624a 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -7,7 +7,7 @@ #include void lay1cal_wait_preheat(); -[[nodiscard]] bool lay1cal_load_filament(char *cmd_buffer, uint8_t filament); +[[nodiscard]] bool lay1cal_load_filament(uint8_t filament); void lay1cal_intro_line(bool skipExtraPurge, float layer_height, float extrusion_width); void lay1cal_before_meander(); void lay1cal_meander_start(float layer_height, float extrusion_width); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0f1b7ac06..2b8137b27 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -830,7 +830,6 @@ void lcd_commands() if (lcd_commands_type == LcdCommands::Layer1Cal) { - char cmd1[30]; const uint16_t nozzle_dia = eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM); const float extrusion_width = (nozzle_dia + 20)/1000.0f; const float layer_height = 0.2f; @@ -848,7 +847,7 @@ void lcd_commands() lay1cal_wait_preheat(); break; case 11: - extraPurgeNeeded = lay1cal_load_filament(cmd1, lay1cal_filament); + extraPurgeNeeded = lay1cal_load_filament(lay1cal_filament); break; case 10: lcd_clear(); @@ -892,8 +891,6 @@ void lcd_commands() } if (lcd_commands_type == LcdCommands::PidExtruder) { - char cmd1[30]; - if (lcd_commands_step == 0) { custom_message_type = CustomMsg::PidCal; custom_message_state = 1; @@ -902,9 +899,8 @@ void lcd_commands() } if (lcd_commands_step == 3 && !blocks_queued()) { //PID calibration preparePidTuning(); // ensure we don't move to the next step early - sprintf_P(cmd1, PSTR("M303 E0 S%3u"), pid_temp); // setting the correct target temperature (for visualization) is done in PID_autotune - enquecommand(cmd1); + enquecommandf(PSTR("M303 E0 S%3u"), pid_temp); lcd_setstatuspgm(_i("PID cal."));////MSG_PID_RUNNING c=20 lcd_commands_step = 2; } @@ -913,8 +909,7 @@ void lcd_commands() lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 setTargetHotend(0); if (_Kp != 0 || _Ki != 0 || _Kd != 0) { - sprintf_P(cmd1, PSTR("M301 P%.2f I%.2f D%.2f"), _Kp, _Ki, _Kd); - enquecommand(cmd1); + enquecommandf(PSTR("M301 P%.2f I%.2f D%.2f"), _Kp, _Ki, _Kd); enquecommand_P(MSG_M500); } else { From b9ce7637df39d673872451eb448a3a2431e3119d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 28 Feb 2023 21:44:34 +0000 Subject: [PATCH 094/240] Rename enquecommandf() into enquecommandf_P() --- Firmware/Marlin_main.cpp | 36 ++++++++++++++++++------------------ Firmware/cardreader.cpp | 2 +- Firmware/cmdqueue.cpp | 2 +- Firmware/cmdqueue.h | 2 +- Firmware/first_lay_cal.cpp | 28 ++++++++++++++-------------- Firmware/ultralcd.cpp | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4d2443dc5..9053472f6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3594,7 +3594,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float // Recover feed rate feedmultiply = feedmultiplyBckp; - enquecommandf(MSG_M220, feedmultiplyBckp); + enquecommandf_P(MSG_M220, feedmultiplyBckp); } lcd_setstatuspgm(MSG_WELCOME); @@ -10776,16 +10776,16 @@ void recover_print(uint8_t automatic) { // and second also so one may remove the excess priming material. if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { - enquecommandf(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); + enquecommandf_P(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); } // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine // transformation status. G28 will not touch Z when MBL is off. enquecommand_P(PSTR("G28 X Y")); // Set the target bed and nozzle temperatures and wait. - enquecommandf(PSTR("M104 S%d"), target_temperature[active_extruder]); - enquecommandf(PSTR("M140 S%d"), target_temperature_bed); - enquecommandf(PSTR("M109 S%d"), target_temperature[active_extruder]); + enquecommandf_P(PSTR("M104 S%d"), target_temperature[active_extruder]); + enquecommandf_P(PSTR("M140 S%d"), target_temperature_bed); + enquecommandf_P(PSTR("M109 S%d"), target_temperature[active_extruder]); enquecommand_P(MSG_M83); //E axis relative mode // If not automatically recoreverd (long power loss) @@ -10793,7 +10793,7 @@ void recover_print(uint8_t automatic) { //Extrude some filament to stabilize the pressure enquecommand_P(PSTR("G1 E5 F120")); // Retract to be consistent with a short pause - enquecommandf(G1_E_F2700, default_retraction); + enquecommandf_P(G1_E_F2700, default_retraction); } printf_P(_N("After waiting for temp:\nCurrent pos X_AXIS:%.3f\nCurrent pos Y_AXIS:%.3f\n"), current_position[X_AXIS], current_position[Y_AXIS]); @@ -10916,7 +10916,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { MYSERIAL.print(filename); strcat_P(filename, PSTR(".gco")); - enquecommandf(MSG_M23, filename); + enquecommandf_P(MSG_M23, filename); uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); MYSERIAL.println(position); @@ -10927,7 +10927,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { float pos_y = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); if (pos_x != X_COORD_INVALID) { - enquecommandf(PSTR("G1 X%f Y%f F3000"), pos_x, pos_y); + enquecommandf_P(PSTR("G1 X%f Y%f F3000"), pos_x, pos_y); } // Enable MBL and switch to logical positioning @@ -10935,29 +10935,29 @@ void restore_print_from_eeprom(bool mbl_was_active) { enquecommand_P(PSTR("PRUSA MBL V1")); // Move the Z axis down to the print, in logical coordinates. - enquecommandf(PSTR("G1 Z%f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); + enquecommandf_P(PSTR("G1 Z%f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); // Restore acceleration settings float acceleration = eeprom_read_float((float*)(EEPROM_UVLO_ACCELL)); float retract_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_RETRACT_ACCELL)); float travel_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL)); - enquecommandf(PSTR("M204 P%f R%f T%f"), acceleration, retract_acceleration, travel_acceleration); + enquecommandf_P(PSTR("M204 P%f R%f T%f"), acceleration, retract_acceleration, travel_acceleration); // Unretract. - enquecommandf(G1_E_F2700, default_retraction); + enquecommandf_P(G1_E_F2700, default_retraction); // Recover final E axis position and mode float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - enquecommandf(PSTR("G92 E%6.3f"), pos_e); + enquecommandf_P(PSTR("G92 E%6.3f"), pos_e); if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) enquecommand_P(PSTR("M82")); //E axis abslute mode // Set the feedrates saved at the power panic. - enquecommandf(PSTR("G1 F%d"), feedrate_rec); - enquecommandf(MSG_M220, feedmultiply_rec); + enquecommandf_P(PSTR("G1 F%d"), feedrate_rec); + enquecommandf_P(MSG_M220, feedmultiply_rec); // Set the fan speed saved at the power panic. - enquecommandf(PSTR("M106 S%u"), fan_speed_rec); + enquecommandf_P(PSTR("M106 S%u"), fan_speed_rec); // Set a position in the file. - enquecommandf(PSTR("M26 S%lu"), position); + enquecommandf_P(PSTR("M26 S%lu"), position); enquecommand_P(PSTR("G4 S0")); enquecommand_P(PSTR("PRUSA uvlo")); } @@ -11141,13 +11141,13 @@ void stop_and_save_print_to_ram(float z_move, float e_move) // A snprintf would have been a safer call, but since it is not used // in the whole program, its implementation would bring more bytes to the total size // The behavior of dtostrf 8,3 should be roughly the same as %-0.3 - enquecommandf(G1_E_F2700, e_move); + enquecommandf_P(G1_E_F2700, e_move); } if(z_move) { // Then lift Z axis - enquecommandf(PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); + enquecommandf_P(PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); } // If this call is invoked from the main Arduino loop() function, let the caller know that the command diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 866a8eff4..8b902b703 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -650,7 +650,7 @@ void CardReader::checkautostart(bool force) if(strncmp((char*)p.name,autoname,5)==0) { // M23: Select SD file - enquecommandf(MSG_M23, autoname); + enquecommandf_P(MSG_M23, autoname); // M24: Start/resume SD print enquecommand_P(MSG_M24); found=true; diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 98a013b37..53f5f5d2b 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -253,7 +253,7 @@ static const char bufferFull[] PROGMEM = "\" failed: Buffer full!"; static const char enqueingFront[] PROGMEM = "Enqueing to the front: \""; -void enquecommandf(const char *fmt, ...) +void enquecommandf_P(const char *fmt, ...) { // MAX_CMD_SIZE is 96, but for formatting // string we usually don't need more than 30 bytes diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 6c7b7a739..2d16b8fb1 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -64,7 +64,7 @@ extern bool cmd_buffer_empty(); /// @brief Variant of enquecommand which accepts a format string /// @param fmt a format string residing in PROGMEM -void enquecommandf(const char *fmt, ...); +void enquecommandf_P(const char *fmt, ...); extern void enquecommand(const char *cmd, bool from_progmem = false); extern void enquecommand_front(const char *cmd, bool from_progmem = false); extern void repeatcommand_front(); diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 84641ac32..e36c1592a 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -75,7 +75,7 @@ bool lay1cal_load_filament(uint8_t filament) enquecommand_P(MSG_M702_NO_LIFT); } // perform a toolchange - enquecommandf(PSTR("T%d"), filament); + enquecommandf_P(PSTR("T%d"), filament); return true; } return false; @@ -123,8 +123,8 @@ void lay1cal_intro_line(bool extraPurgeNeeded, float layer_height, float extrusi else { static const char fmt1[] PROGMEM = "G1 X%d E%-.3f F1000"; - enquecommandf(fmt1, 60, count_e(layer_height, extrusion_width * 4.f, 60)); - enquecommandf(fmt1, 100, count_e(layer_height, extrusion_width * 8.f, 40)); + enquecommandf_P(fmt1, 60, count_e(layer_height, extrusion_width * 4.f, 60)); + enquecommandf_P(fmt1, 100, count_e(layer_height, extrusion_width * 8.f, 40)); } } @@ -160,14 +160,14 @@ void lay1cal_meander_start(float layer_height, float extrusion_width) enquecommand_P(PSTR("G1 X50 Y155")); static const char fmt1[] PROGMEM = "G1 Z%-.3f F7200"; - enquecommandf(fmt1, layer_height); + enquecommandf_P(fmt1, layer_height); enquecommand_P(PSTR("G1 F1080")); - enquecommandf(extrude_fmt, 75, 155, count_e(layer_height, extrusion_width * 4.f, 25)); - enquecommandf(extrude_fmt, 100, 155, count_e(layer_height, extrusion_width * 2.f, 25)); - enquecommandf(extrude_fmt, 200, 155, count_e(layer_height, extrusion_width, 100)); - enquecommandf(extrude_fmt, 200, 135, count_e(layer_height, extrusion_width, 20)); + enquecommandf_P(extrude_fmt, 75, 155, count_e(layer_height, extrusion_width * 4.f, 25)); + enquecommandf_P(extrude_fmt, 100, 155, count_e(layer_height, extrusion_width * 2.f, 25)); + enquecommandf_P(extrude_fmt, 200, 155, count_e(layer_height, extrusion_width, 100)); + enquecommandf_P(extrude_fmt, 200, 135, count_e(layer_height, extrusion_width, 20)); } //! @brief Print meander @@ -183,11 +183,11 @@ void lay1cal_meander(float layer_height, float extrusion_width) uint8_t x_pos = 50; for(uint8_t i = 0; i <= 4; ++i) { - enquecommandf(extrude_fmt, x_pos, y_pos, long_extrusion); + enquecommandf_P(extrude_fmt, x_pos, y_pos, long_extrusion); y_pos -= short_length; - enquecommandf(extrude_fmt, x_pos, y_pos, short_extrusion); + enquecommandf_P(extrude_fmt, x_pos, y_pos, short_extrusion); x_pos += long_length; @@ -212,10 +212,10 @@ void lay1cal_square(uint8_t step, float layer_height, float extrusion_width) for (uint8_t i = step; i < step+4; ++i) { - enquecommandf(fmt1, 70, (35 - i*short_length * 2), long_extrusion); - enquecommandf(fmt1, 70, (35 - (2 * i + 1)*short_length), short_extrusion); - enquecommandf(fmt1, 50, (35 - (2 * i + 1)*short_length), long_extrusion); - enquecommandf(fmt1, 50, (35 - (i + 1)*short_length * 2), short_extrusion); + enquecommandf_P(fmt1, 70, (35 - i*short_length * 2), long_extrusion); + enquecommandf_P(fmt1, 70, (35 - (2 * i + 1)*short_length), short_extrusion); + enquecommandf_P(fmt1, 50, (35 - (2 * i + 1)*short_length), long_extrusion); + enquecommandf_P(fmt1, 50, (35 - (i + 1)*short_length * 2), short_extrusion); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2b8137b27..d098e614d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -900,7 +900,7 @@ void lcd_commands() if (lcd_commands_step == 3 && !blocks_queued()) { //PID calibration preparePidTuning(); // ensure we don't move to the next step early // setting the correct target temperature (for visualization) is done in PID_autotune - enquecommandf(PSTR("M303 E0 S%3u"), pid_temp); + enquecommandf_P(PSTR("M303 E0 S%3u"), pid_temp); lcd_setstatuspgm(_i("PID cal."));////MSG_PID_RUNNING c=20 lcd_commands_step = 2; } @@ -909,7 +909,7 @@ void lcd_commands() lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 setTargetHotend(0); if (_Kp != 0 || _Ki != 0 || _Kd != 0) { - enquecommandf(PSTR("M301 P%.2f I%.2f D%.2f"), _Kp, _Ki, _Kd); + enquecommandf_P(PSTR("M301 P%.2f I%.2f D%.2f"), _Kp, _Ki, _Kd); enquecommand_P(MSG_M500); } else { From 7f921b4071da2e2449dc8002e5e9a0891279dac0 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 5 Apr 2023 08:27:07 +0200 Subject: [PATCH 095/240] Limit some of the float formatting to fit 30 bytes buffer in enquecommandf_P --- Firmware/Marlin_main.cpp | 11 ++++++----- Firmware/messages.cpp | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9053472f6..1ccb2f9ca 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10927,7 +10927,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { float pos_y = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); if (pos_x != X_COORD_INVALID) { - enquecommandf_P(PSTR("G1 X%f Y%f F3000"), pos_x, pos_y); + enquecommandf_P(PSTR("G1 X%-.3f Y%-.3f F3000"), pos_x, pos_y); } // Enable MBL and switch to logical positioning @@ -10935,19 +10935,20 @@ void restore_print_from_eeprom(bool mbl_was_active) { enquecommand_P(PSTR("PRUSA MBL V1")); // Move the Z axis down to the print, in logical coordinates. - enquecommandf_P(PSTR("G1 Z%f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); + enquecommandf_P(PSTR("G1 Z%-.3f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); // Restore acceleration settings float acceleration = eeprom_read_float((float*)(EEPROM_UVLO_ACCELL)); float retract_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_RETRACT_ACCELL)); float travel_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL)); - enquecommandf_P(PSTR("M204 P%f R%f T%f"), acceleration, retract_acceleration, travel_acceleration); + // accelerations are usually ordinary numbers, no need to keep extensive amount of decimal places + enquecommandf_P(PSTR("M204 P%-.1f R%-.1f T%-.1f"), acceleration, retract_acceleration, travel_acceleration); // Unretract. enquecommandf_P(G1_E_F2700, default_retraction); // Recover final E axis position and mode float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - enquecommandf_P(PSTR("G92 E%6.3f"), pos_e); + enquecommandf_P(PSTR("G92 E%-.3f"), pos_e); if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) enquecommand_P(PSTR("M82")); //E axis abslute mode // Set the feedrates saved at the power panic. @@ -11147,7 +11148,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) if(z_move) { // Then lift Z axis - enquecommandf_P(PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); + enquecommandf_P(PSTR("G1 Z%-.3f F%-.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); } // If this call is invoked from the main Arduino loop() function, let the caller know that the command diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index ad9b2b2f3..3702feb10 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -230,7 +230,7 @@ const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes -const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-0.3f F2700"; +const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-.3f F2700"; const char G28W[] PROGMEM_N1 = "G28 W"; const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M24[] PROGMEM_N1 = "M24"; From 956efde82276300d4e96f40cd829c5a28a048611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 30 Dec 2022 14:52:08 +0000 Subject: [PATCH 096/240] G80: Re-implement optimisation from user espr14 Original Pull Request: https://github.com/prusa3d/Prusa-Firmware/pull/3061 Change in memory: Flash: -292 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 61 +++++++++++++--------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1ccb2f9ca..dbe8cfe93 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3090,61 +3090,38 @@ static void gcode_G80() eeprom_bed_correction_valid ? SERIAL_PROTOCOLPGM("Bed correction data valid\n") : SERIAL_PROTOCOLPGM("Bed correction data not valid\n"); } #endif // SUPPORT_VERBOSITY - - for (uint8_t i = 0; i < 4; ++i) { - static const char codes[4] PROGMEM = { 'L', 'R', 'F', 'B' }; - static uint8_t *const eep_addresses[4] PROGMEM = { + const constexpr uint8_t sides = 4; + long correction[sides] = {0}; + for (uint8_t i = 0; i < sides; ++i) { + static const char codes[sides] PROGMEM = { 'L', 'R', 'F', 'B' }; + static uint8_t *const eep_addresses[sides] PROGMEM = { (uint8_t*)EEPROM_BED_CORRECTION_LEFT, (uint8_t*)EEPROM_BED_CORRECTION_RIGHT, (uint8_t*)EEPROM_BED_CORRECTION_FRONT, (uint8_t*)EEPROM_BED_CORRECTION_REAR, }; - long correction = 0; if (code_seen(pgm_read_byte(&codes[i]))) - correction = code_value_long(); + correction[i] = code_value_long(); else if (eeprom_bed_correction_valid) - correction = (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])); - if (correction == 0) + correction[i] = (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])); + if (correction[i] == 0) continue; - if (labs(correction) > BED_ADJUSTMENT_UM_MAX) { + if (labs(correction[i]) > BED_ADJUSTMENT_UM_MAX) { SERIAL_ERROR_START; SERIAL_ECHOPGM("Excessive bed leveling correction: "); - SERIAL_ECHO(correction); + SERIAL_ECHO(correction[i]); SERIAL_ECHOLNPGM(" microns"); + correction[i] = 0; } - else { - float offset = float(correction) * 0.001f; - switch (i) { - case 0: - for (uint8_t row = 0; row < nMeasPoints; ++row) { - for (uint8_t col = 0; col < nMeasPoints - 1; ++col) { - mbl.z_values[row][col] += offset * (nMeasPoints - 1 - col) / (nMeasPoints - 1); - } - } - break; - case 1: - for (uint8_t row = 0; row < nMeasPoints; ++row) { - for (uint8_t col = 1; col < nMeasPoints; ++col) { - mbl.z_values[row][col] += offset * col / (nMeasPoints - 1); - } - } - break; - case 2: - for (uint8_t col = 0; col < nMeasPoints; ++col) { - for (uint8_t row = 0; row < nMeasPoints; ++row) { - mbl.z_values[row][col] += offset * (nMeasPoints - 1 - row) / (nMeasPoints - 1); - } - } - break; - case 3: - for (uint8_t col = 0; col < nMeasPoints; ++col) { - for (uint8_t row = 1; row < nMeasPoints; ++row) { - mbl.z_values[row][col] += offset * row / (nMeasPoints - 1); - } - } - break; - } + } + for (uint8_t row = 0; row < nMeasPoints; ++row) { + for (uint8_t col = 0; col < nMeasPoints; ++col) { + mbl.z_values[row][col] +=0.001f * ( + + correction[0] * (nMeasPoints - 1 - col) + + correction[1] * col + + correction[2] * (nMeasPoints - 1 - row) + + correction[3] * row) / (float)(nMeasPoints - 1); } } // SERIAL_ECHOLNPGM("Bed leveling correction finished"); From 7de725f840e032c4cc873da8a6e3556cea63e464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 30 Dec 2022 15:26:53 +0000 Subject: [PATCH 097/240] G80: Change 'correction' data type to int8_t Valid values range from -100 to 100. Storing this value as four bytes (int32_t) is not efficient. Instead we can store G80 user input temporarily as int32_t and check if the value is within the allowed range. If it is, then we convert the int32_t (4 bytes) to int8_t (1 byte). Change in memory: Flash: -78 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index dbe8cfe93..dea72681d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3091,7 +3091,7 @@ static void gcode_G80() } #endif // SUPPORT_VERBOSITY const constexpr uint8_t sides = 4; - long correction[sides] = {0}; + int8_t correction[sides] = {0}; for (uint8_t i = 0; i < sides; ++i) { static const char codes[sides] PROGMEM = { 'L', 'R', 'F', 'B' }; static uint8_t *const eep_addresses[sides] PROGMEM = { @@ -3101,19 +3101,22 @@ static void gcode_G80() (uint8_t*)EEPROM_BED_CORRECTION_REAR, }; if (code_seen(pgm_read_byte(&codes[i]))) - correction[i] = code_value_long(); - else if (eeprom_bed_correction_valid) + { // Verify value is within allowed range + int32_t temp = code_value_long(); + if (labs(temp) > BED_ADJUSTMENT_UM_MAX) { + SERIAL_ERROR_START; + SERIAL_ECHOPGM("Excessive bed leveling correction: "); + SERIAL_ECHO(temp); + SERIAL_ECHOLNPGM(" microns"); + correction[i] = 0; + } else { + // Value is valid, save it + correction[i] = (int8_t)temp; + } + } else if (eeprom_bed_correction_valid) correction[i] = (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])); if (correction[i] == 0) continue; - - if (labs(correction[i]) > BED_ADJUSTMENT_UM_MAX) { - SERIAL_ERROR_START; - SERIAL_ECHOPGM("Excessive bed leveling correction: "); - SERIAL_ECHO(correction[i]); - SERIAL_ECHOLNPGM(" microns"); - correction[i] = 0; - } } for (uint8_t row = 0; row < nMeasPoints; ++row) { for (uint8_t col = 0; col < nMeasPoints; ++col) { From 0cac7612db26d8d2c027b86907a0a03d1a3db651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 22 Feb 2023 18:06:02 +0000 Subject: [PATCH 098/240] optimisation: Always make sound when knob is clicked or rotated This commit adds the ability for firmware to make sounds when the knob is clicked or rotated, when LCD updates are disabled. The improvement here is the sound is being made with one line of code whether or not LCD updates are enabled or disabled. Change in memory: Flash: -24 bytes SRAM: 0 bytes --- Firmware/lcd.cpp | 6 ++++++ Firmware/mmu2_reporting.cpp | 4 +--- Firmware/ultralcd.cpp | 18 +++--------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 5c0159050..6c458d1ae 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -701,6 +701,12 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) if (lcd_backlight_wake_trigger) { lcd_backlight_wake_trigger = false; backlight_wake(); + if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + // TODO: update lcd_encoder here + Sound_MakeSound(e_SOUND_TYPE_EncoderMove); + } else { + Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); + } } backlight_update(); diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 87615b56e..0ae183b22 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -179,14 +179,12 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { // More button for two button screen lcd_putc_at(18, 3, current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); } - // Consume rotation event and make feedback sound + // Consume rotation event enc_dif = lcd_encoder_diff; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } // Check if knob was clicked and consume the event if (lcd_clicked()) { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); choice_selected = current_selection; } else { // continue monitoring diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d098e614d..d568b785d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2230,8 +2230,7 @@ uint8_t lcd_alright() { lcd_consume_click(); while (1) { - manage_heater(); - manage_inactivity(true); + delay_keep_alive(0); if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { @@ -2257,13 +2256,11 @@ uint8_t lcd_alright() { // Consume rotation event and make feedback sound enc_dif = lcd_encoder_diff; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); } if (lcd_clicked()) { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); lcd_clear(); lcd_return_to_status(); return cursor_pos; @@ -3132,14 +3129,12 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P( } lcd_show_choices_prompt_P(current_selection, first_choice, second_choice, second_col, third_choice); enc_dif = lcd_encoder_diff; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else { Sound_MakeSound(e_SOUND_TYPE_BlindAlert); break; // turning knob skips waiting loop } } if (lcd_clicked()) { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); if (msg_next == NULL) { goto exit; } else @@ -4736,8 +4731,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite KEEPALIVE_STATE(PAUSED_FOR_USER); while (1) { - manage_heater(); - manage_inactivity(true); + delay_keep_alive(0); if (abs((enc_dif - lcd_encoder_diff)) > 4) { @@ -4751,7 +4745,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite cursor_pos++; } enc_dif = lcd_encoder_diff; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } if (cursor_pos > 3) @@ -4802,7 +4795,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (lcd_clicked()) { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); KEEPALIVE_STATE(IN_HANDLER); lcd_encoder_diff = 0; return(cursor_pos + first - 1); @@ -4834,8 +4826,7 @@ char reset_menu() { lcd_puts_at_P(1, i, item[first + i]); } - manage_heater(); - manage_inactivity(true); + delay_keep_alive(0); if (abs((enc_dif - lcd_encoder_diff)) > 4) { @@ -4868,7 +4859,6 @@ char reset_menu() { lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); lcd_set_cursor(0, cursor_pos); lcd_putc('>'); - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); } @@ -4876,7 +4866,6 @@ char reset_menu() { } if (lcd_clicked()) { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); return(cursor_pos + first); } @@ -7499,7 +7488,6 @@ void menu_lcd_lcdupdate_func(void) if (lcd_draw_update == 0) lcd_draw_update = 1; lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); lcd_encoder_diff = 0; lcd_timeoutToStatus.start(); } From 67c206ea5c3c00c598543344e2f6d2ff9cf828d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 11:53:05 +0000 Subject: [PATCH 099/240] Remove menu_back_if_clicked_fb Since feedback is always produced on knob click we can use menu_back_if_clicked instead Change in memory: Flash: -18 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 9 --------- Firmware/menu.h | 2 -- Firmware/ultralcd.cpp | 17 ++++++++--------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 56e729639..4cc87b26d 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -119,15 +119,6 @@ void menu_back_if_clicked(void) menu_back(); } -void menu_back_if_clicked_fb(void) -{ - if (lcd_clicked()) - { - lcd_quick_feedback(); - menu_back(); - } -} - void menu_submenu(menu_func_t submenu) { if (menu_depth < MENU_DEPTH_MAX) diff --git a/Firmware/menu.h b/Firmware/menu.h index 4b5a6780d..cb4101e10 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -78,8 +78,6 @@ extern void menu_back(uint8_t nLevel); extern void menu_back_if_clicked(void); -extern void menu_back_if_clicked_fb(void); - extern void menu_submenu(menu_func_t submenu); extern void menu_submenu_no_reset(menu_func_t submenu); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d568b785d..c5b87baac 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1142,7 +1142,7 @@ static void lcd_menu_fails_stats_mmu_print() { _T(MSG_LAST_PRINT_FAILURES), _T(MSG_MMU_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL) ), _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL) )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Total Failures Statistics MMU @@ -1168,7 +1168,7 @@ static void lcd_menu_fails_stats_mmu_total() { _T(MSG_MMU_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_FAIL_TOT) ), _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) ), _T(MSG_MMU_POWER_FAILS), clamp999( MMU2::mmu2.TMCFailures() )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Total Failures Statistics MMU @@ -1197,8 +1197,7 @@ static void lcd_menu_toolchange_stats_mmu_total() lcd_print(eeprom_read_dword((uint32_t*)EEPROM_MMU_MATERIAL_CHANGES)); _md->initialized = true; } - - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } #if defined(TMC2130) && defined(FILAMENT_SENSOR) @@ -1225,7 +1224,7 @@ static void lcd_menu_fails_stats_total() _T(MSG_CRASH), clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT) ), clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT) )); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Show Last Print Failures Statistics @@ -1252,7 +1251,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_POWER_FAILURES), power, _T(MSG_FIL_RUNOUTS), filam, _T(MSG_CRASH), crashX, crashY); - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } //! @brief Open fail statistics menu @@ -1349,7 +1348,7 @@ static void lcd_menu_debug() " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=14 #endif //DEBUG_STACK_MONITOR - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } #endif /* DEBUG_BUILD */ @@ -2354,7 +2353,7 @@ void lcd_menu_statistics() ), _i("Filament used"), _met, ////MSG_FILAMENT_USED c=19 _i("Print time"), _h, _m, _s); ////MSG_PRINT_TIME c=19 - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } else { @@ -2376,7 +2375,7 @@ void lcd_menu_statistics() ), _i("Total filament"), _filament_m, ////MSG_TOTAL_FILAMENT c=19 _i("Total print time"), _days, _hours, _minutes); ////MSG_TOTAL_PRINT_TIME c=19 - menu_back_if_clicked_fb(); + menu_back_if_clicked(); } } From d89e6de0402bd1de3009f89ea67a4cbf086536cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 12:10:20 +0000 Subject: [PATCH 100/240] Update lcd_encoder in lcd_update This fixes the spurious feedback when rotating the knob because lcd_update is called much often than the interval at which the lcd rendering is updated Change in memory Flash: -88 bytes SRAM: -9 bytes --- Firmware/Marlin_main.cpp | 2 - Firmware/lcd.cpp | 5 +- Firmware/lcd.h | 3 - Firmware/mmu2_reporting.cpp | 20 ++---- Firmware/ultralcd.cpp | 123 +++++++++++++++--------------------- 5 files changed, 60 insertions(+), 93 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index dea72681d..46ac1581b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1273,8 +1273,6 @@ void setup() eeprom_init_default_byte((uint8_t*)EEPROM_SILENT, SILENT_MODE_OFF); eeprom_init_default_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard if uninitialized - lcd_encoder_diff=0; - #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silentMode == 0xff) silentMode = 0; diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 6c458d1ae..432b0b927 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -634,7 +634,7 @@ void lcd_printNumber(unsigned long n, uint8_t base) uint8_t lcd_draw_update = 2; int32_t lcd_encoder = 0; uint8_t lcd_encoder_bits = 0; -int8_t lcd_encoder_diff = 0; +static int8_t lcd_encoder_diff = 0; uint8_t lcd_buttons = 0; uint8_t lcd_button_pressed = 0; @@ -702,7 +702,8 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) lcd_backlight_wake_trigger = false; backlight_wake(); if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { - // TODO: update lcd_encoder here + lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; + lcd_encoder_diff = 0; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); diff --git a/Firmware/lcd.h b/Firmware/lcd.h index b2f7bb166..56f0b4838 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -102,9 +102,6 @@ extern int32_t lcd_encoder; extern uint8_t lcd_encoder_bits; -// lcd_encoder_diff is updated from interrupt context and added to lcd_encoder every LCD update -extern int8_t lcd_encoder_diff; - //the last checked lcd_buttons in a bit array. extern uint8_t lcd_buttons; diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 0ae183b22..4a6be0991 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -99,16 +99,8 @@ void ReportErrorHookSensorLineRender(){ static uint8_t ReportErrorHookMonitor(uint8_t ei) { uint8_t ret = 0; bool two_choices = false; - static int8_t enc_dif = lcd_encoder_diff; static uint8_t reset_button_selection; - if (lcd_encoder_diff == 0) - { - // lcd_update_enable(true) was called outside ReportErrorHookMonitor - // It will set lcd_encoder_diff to 0, sync enc_dif - enc_dif = 0; - } - // Read and determine what operations should be shown on the menu const uint8_t button_operation = PrusaErrorButtons(ei); const uint8_t button_op_right = BUTTON_OP_RIGHT(button_operation); @@ -132,20 +124,20 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { } // Check if knob was rotated - if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + if (lcd_encoder) { if (two_choices == false) { // third_choice is not nullptr, safe to dereference - if (enc_dif > lcd_encoder_diff && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection--; - } else if (enc_dif < lcd_encoder_diff && current_selection != LCD_RIGHT_BUTTON_CHOICE) { + } else if (lcd_encoder < 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { // Rotating knob clockwise current_selection++; } } else { - if (enc_dif > lcd_encoder_diff && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection = LCD_LEFT_BUTTON_CHOICE; - } else if (enc_dif < lcd_encoder_diff && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { + } else if (lcd_encoder < 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { // Rotating knob clockwise current_selection = LCD_MIDDLE_BUTTON_CHOICE; } @@ -180,7 +172,7 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { lcd_putc_at(18, 3, current_selection == LCD_MIDDLE_BUTTON_CHOICE ? '>': ' '); } // Consume rotation event - enc_dif = lcd_encoder_diff; + lcd_encoder = 0; } // Check if knob was clicked and consume the event diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c5b87baac..cc10eae9f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2214,7 +2214,6 @@ void lcd_loading_filament() { uint8_t lcd_alright() { - int8_t enc_dif = 0; uint8_t cursor_pos = 1; lcd_clear(); @@ -2224,20 +2223,18 @@ uint8_t lcd_alright() { lcd_puts_at_P(1, 3, _i("Color not correct"));////MSG_NOT_COLOR c=19 lcd_putc_at(0, 1, '>'); - - enc_dif = lcd_encoder_diff; lcd_consume_click(); while (1) { delay_keep_alive(0); - if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) + if (lcd_encoder) { - if (enc_dif > lcd_encoder_diff ) { + if (lcd_encoder > 0 ) { // Rotating knob counter clockwise cursor_pos--; - } else if (enc_dif < lcd_encoder_diff) { + } else if (lcd_encoder < 0) { // Rotating knob clockwise cursor_pos++; } @@ -2254,7 +2251,7 @@ uint8_t lcd_alright() { lcd_putc_at(0, cursor_pos, '>'); // Consume rotation event and make feedback sound - enc_dif = lcd_encoder_diff; + lcd_encoder = 0; _delay(100); } @@ -2828,15 +2825,12 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) const bool multi_screen = msg_next != NULL; unsigned long previous_millis_msg = _millis(); // Until the user finishes the z up movement. - lcd_encoder_diff = 0; lcd_encoder = 0; for (;;) { manage_heater(); manage_inactivity(true); - if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + if (lcd_encoder) { _delay(50); - lcd_encoder += abs(lcd_encoder_diff / ENCODER_PULSES_PER_STEP); - lcd_encoder_diff = 0; if (! planner_queue_full()) { // Only move up, whatever direction the user rotates the encoder. current_position[Z_AXIS] += fabs(lcd_encoder); @@ -3097,7 +3091,6 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P( } // Wait for user confirmation or a timeout. unsigned long previous_millis_cmd = _millis(); - int8_t enc_dif = lcd_encoder_diff; lcd_consume_click(); KEEPALIVE_STATE(PAUSED_FOR_USER); for (;;) { @@ -3107,27 +3100,27 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P( current_selection = LCD_BUTTON_TIMEOUT; goto exit; } - if (abs(enc_dif - lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + if (lcd_encoder) { if (msg_next == NULL) { if (third_choice) { // third_choice is not nullptr, safe to dereference - if (enc_dif > lcd_encoder_diff && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection--; - } else if (enc_dif < lcd_encoder_diff && current_selection != LCD_RIGHT_BUTTON_CHOICE) { + } else if (lcd_encoder < 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { // Rotating knob clockwise current_selection++; } } else { - if (enc_dif > lcd_encoder_diff && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection = LCD_LEFT_BUTTON_CHOICE; - } else if (enc_dif < lcd_encoder_diff && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { + } else if (lcd_encoder < 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { // Rotating knob clockwise current_selection = LCD_MIDDLE_BUTTON_CHOICE; } } lcd_show_choices_prompt_P(current_selection, first_choice, second_choice, second_col, third_choice); - enc_dif = lcd_encoder_diff; + lcd_encoder = 0; } else { Sound_MakeSound(e_SOUND_TYPE_BlindAlert); break; // turning knob skips waiting loop @@ -3474,7 +3467,6 @@ static void lcd_silent_mode_set() { #ifdef TMC2130 if (lcd_crash_detect_enabled() && (SilentModeMenu != SILENT_MODE_NORMAL)) menu_submenu(lcd_crash_mode_info2); - lcd_encoder_diff=0; // reset 'encoder buffer' #endif //TMC2130 } @@ -4722,7 +4714,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite const int8_t items_no = last_item?(MMU2::mmu2.Enabled()?6:5):(MMU2::mmu2.Enabled()?5:4); const uint8_t item_len = item?strlen_P(item):0; int8_t first = 0; - int8_t enc_dif = lcd_encoder_diff; int8_t cursor_pos = 1; lcd_clear(); @@ -4732,18 +4723,18 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite { delay_keep_alive(0); - if (abs((enc_dif - lcd_encoder_diff)) > 4) + if (lcd_encoder) { - if (enc_dif > lcd_encoder_diff) + if (lcd_encoder > 0) { cursor_pos--; } - if (enc_dif < lcd_encoder_diff) + if (lcd_encoder < 0) { cursor_pos++; } - enc_dif = lcd_encoder_diff; + lcd_encoder = 0; } if (cursor_pos > 3) @@ -4795,7 +4786,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (lcd_clicked()) { KEEPALIVE_STATE(IN_HANDLER); - lcd_encoder_diff = 0; return(cursor_pos + first - 1); } } @@ -4803,7 +4793,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite char reset_menu() { static int8_t first = 0; - int8_t enc_dif = 0; char cursor_pos = 0; const char *const item[] = { @@ -4813,8 +4802,7 @@ char reset_menu() { PSTR("Service prep"), PSTR("All Data"), }; - - enc_dif = lcd_encoder_diff; + lcd_clear(); lcd_set_cursor(0, 0); lcd_putc('>'); @@ -4827,41 +4815,37 @@ char reset_menu() { delay_keep_alive(0); - if (abs((enc_dif - lcd_encoder_diff)) > 4) { + if (lcd_encoder) { + if (lcd_encoder > 0) { + cursor_pos--; + } - if ((abs(enc_dif - lcd_encoder_diff)) > 1) { - if (enc_dif > lcd_encoder_diff) { - cursor_pos--; - } + if (lcd_encoder < 0) { + cursor_pos++; + } - if (enc_dif < lcd_encoder_diff) { - cursor_pos++; - } - - if (cursor_pos > 3) { - cursor_pos = 3; - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); - if (first < (uint8_t)(sizeof(item) / sizeof(item[0])) - 4) { - first++; - lcd_clear(); - } - } - - if (cursor_pos < 0) { - cursor_pos = 0; - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); - if (first > 0) { - first--; - lcd_clear(); - } - } - lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); - lcd_set_cursor(0, cursor_pos); - lcd_putc('>'); - enc_dif = lcd_encoder_diff; - _delay(100); - } + if (cursor_pos > 3) { + cursor_pos = 3; + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); + if (first < (uint8_t)(sizeof(item) / sizeof(item[0])) - 4) { + first++; + lcd_clear(); + } + } + if (cursor_pos < 0) { + cursor_pos = 0; + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); + if (first > 0) { + first--; + lcd_clear(); + } + } + lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); + lcd_set_cursor(0, cursor_pos); + lcd_putc('>'); + lcd_encoder = 0; + _delay(100); } if (lcd_clicked()) { @@ -6937,15 +6921,15 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, lcd_putc_at(0, 3, '>'); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); - int8_t enc_dif = int(_default)*3; + lcd_encoder = _default; KEEPALIVE_STATE(PAUSED_FOR_USER); lcd_button_pressed = false; do { - if (abs((enc_dif - lcd_encoder_diff)) > 2) { - if (enc_dif > lcd_encoder_diff) { + if (lcd_encoder) { + if (lcd_encoder > 0) { _result = !check_opposite; lcd_putc_at(0, 2, '>'); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); @@ -6953,15 +6937,14 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } - if (enc_dif < lcd_encoder_diff) { + if (lcd_encoder < 0) { _result = check_opposite; lcd_putc_at(0, 2, ' '); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_putc_at(0, 3, '>'); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } - enc_dif = 0; - lcd_encoder_diff = 0; + lcd_encoder = 0; } @@ -7267,7 +7250,6 @@ void ultralcd_init() _delay_ms(1); //wait for the pullups to raise the line lcd_oldcardstatus = IS_SD_INSERTED; #endif//(SDCARDDETECT > 0) - lcd_encoder_diff = 0; // Initialise status line strncpy_P(lcd_status_message, MSG_WELCOME, LCD_WIDTH); @@ -7482,12 +7464,9 @@ void menu_lcd_lcdupdate_func(void) #endif//CARDINSERTED if (lcd_next_update_millis < _millis()) { - if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) + if (lcd_encoder) { - if (lcd_draw_update == 0) - lcd_draw_update = 1; - lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; - lcd_encoder_diff = 0; + if (lcd_draw_update == 0) lcd_draw_update = 1; lcd_timeoutToStatus.start(); } From a7e9ccfb57e436311cb28b5636b8f66fe7982909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 16:55:38 +0000 Subject: [PATCH 101/240] Major refactoring Fixes all the issues I've found so far. Roughly 60B of flash saved. Need to double check that later. --- Firmware/Marlin_main.cpp | 2 +- Firmware/lcd.cpp | 33 +++++------ Firmware/lcd.h | 5 +- Firmware/menu.cpp | 35 +++++------- Firmware/menu.h | 6 +- Firmware/ultralcd.cpp | 118 ++++++++++++++++++--------------------- 6 files changed, 86 insertions(+), 113 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 46ac1581b..6cec34683 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9455,11 +9455,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s // handle longpress if(lcd_longpress_trigger) { + lcd_consume_click(); // Reset trigger to prevent recursion // long press is not possible in modal mode, wait until ready if (lcd_longpress_func && lcd_update_enabled) { lcd_longpress_func(); - lcd_longpress_trigger = 0; } } diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 432b0b927..91ea95493 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -637,7 +637,6 @@ uint8_t lcd_encoder_bits = 0; static int8_t lcd_encoder_diff = 0; uint8_t lcd_buttons = 0; -uint8_t lcd_button_pressed = 0; uint8_t lcd_update_enabled = 1; static bool lcd_backlight_wake_trigger; // Flag set by interrupt when the knob is pressed or rotated @@ -689,7 +688,6 @@ Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); void lcd_quick_feedback(void) { lcd_draw_update = 2; - lcd_button_pressed = false; lcd_beeper_quick_feedback(); } @@ -708,6 +706,11 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) } else { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); } + + if (lcd_draw_update == 0) { + // Update LCD rendering at minimum + lcd_draw_update = 1; + } } backlight_update(); @@ -750,16 +753,12 @@ bool lcd_longpress_trigger = 0; void lcd_buttons_update(void) { static uint8_t lcd_long_press_active = 0; - uint8_t newbutton = 0; - if (READ(BTN_EN1) == 0) newbutton |= EN_A; - if (READ(BTN_EN2) == 0) newbutton |= EN_B; - + static uint8_t lcd_button_pressed = 0; if (READ(BTN_ENC) == 0) { //button is pressed - if (!buttonBlanking.running() || buttonBlanking.expired(BUTTON_BLANKING_TIME)) { + if (buttonBlanking.expired_cont(BUTTON_BLANKING_TIME)) { buttonBlanking.start(); safetyTimer.start(); - lcd_backlight_wake_trigger = true; // flag event, knob pressed if ((lcd_button_pressed == 0) && (lcd_long_press_active == 0)) { longPressTimer.start(); @@ -776,22 +775,20 @@ void lcd_buttons_update(void) { //button not pressed if (lcd_button_pressed) { //button was released - buttonBlanking.start(); - if (lcd_long_press_active == 0) + lcd_button_pressed = 0; // Reset to prevent double triggering + if (!lcd_long_press_active) { //button released before long press gets activated - newbutton |= EN_C; + lcd_buttons |= EN_C; // This flag is reset when the event is consumed } - //else if (menu_menu == lcd_move_z) lcd_quick_feedback(); - //lcd_button_pressed is set back to false via lcd_quick_feedback function + lcd_backlight_wake_trigger = true; // flag event, knob pressed + lcd_long_press_active = 0; } - lcd_long_press_active = 0; } - lcd_buttons = newbutton; //manage encoder rotation uint8_t enc = 0; - if (lcd_buttons & EN_A) enc |= B01; - if (lcd_buttons & EN_B) enc |= B10; + if (READ(BTN_EN1) == 0) enc |= B01; + if (READ(BTN_EN2) == 0) enc |= B10; if (enc != lcd_encoder_bits) { switch (enc) @@ -825,8 +822,8 @@ void lcd_buttons_update(void) if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { lcd_backlight_wake_trigger = true; // flag event, knob rotated } + lcd_encoder_bits = enc; } - lcd_encoder_bits = enc; } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 56f0b4838..538095dd9 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -105,8 +105,6 @@ extern uint8_t lcd_encoder_bits; //the last checked lcd_buttons in a bit array. extern uint8_t lcd_buttons; -extern uint8_t lcd_button_pressed; - extern uint8_t lcd_update_enabled; extern LongTimer lcd_timeoutToStatus; @@ -212,8 +210,7 @@ extern void lcd_set_custom_characters_nextpage(void); //! @brief Consume click and longpress event inline void lcd_consume_click() { - lcd_button_pressed = 0; - lcd_buttons &= 0xff^EN_C; + lcd_buttons = 0; lcd_longpress_trigger = 0; } diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 4cc87b26d..de80ae7e6 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -45,7 +45,7 @@ void menu_data_reset(void) memset(&menu_data, 0, sizeof(menu_data)); } -void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bool reset_menu_state) +void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback) { CRITICAL_SECTION_START; if (menu_menu != menu) @@ -53,11 +53,10 @@ void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bo menu_menu = menu; lcd_encoder = encoder; menu_top = 0; //reset menu view. Needed if menu_back() is called from deep inside a menu, such as Support + lcd_draw_update = 2; // Full LCD re-draw CRITICAL_SECTION_END; - if (reset_menu_state) - menu_data_reset(); - - if (feedback) lcd_quick_feedback(); + if (feedback) lcd_beeper_quick_feedback(); + if (reset_menu_state) menu_data_reset(); } else CRITICAL_SECTION_END; @@ -74,7 +73,7 @@ void menu_start(void) if (lcd_encoder < menu_top) menu_top = lcd_encoder; menu_line = menu_top; - menu_clicked = LCD_CLICKED; + menu_clicked = lcd_clicked(); // Consume click event } void menu_end(void) @@ -96,7 +95,7 @@ void menu_end(void) void menu_back(uint8_t nLevel) { menu_depth = ((menu_depth > nLevel) ? (menu_depth - nLevel) : 0); - menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position, true, true); + menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position, true); } void menu_back(void) @@ -109,7 +108,7 @@ void menu_back_no_reset(void) if (menu_depth > 0) { menu_depth--; - menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position, true, false); + menu_goto(menu_stack[menu_depth].menu, menu_stack[menu_depth].position, false); } } @@ -119,29 +118,29 @@ void menu_back_if_clicked(void) menu_back(); } -void menu_submenu(menu_func_t submenu) +void menu_submenu(menu_func_t submenu, const bool feedback) { if (menu_depth < MENU_DEPTH_MAX) { menu_stack[menu_depth].menu = menu_menu; menu_stack[menu_depth++].position = lcd_encoder; - menu_goto(submenu, 0, true, true); + menu_goto(submenu, 0, true, feedback); } } -void menu_submenu_no_reset(menu_func_t submenu) +void menu_submenu_no_reset(menu_func_t submenu, const bool feedback) { if (menu_depth < MENU_DEPTH_MAX) { menu_stack[menu_depth].menu = menu_menu; menu_stack[menu_depth++].position = lcd_encoder; - menu_goto(submenu, 0, true, false); + menu_goto(submenu, 0, false, feedback); } } uint8_t menu_item_ret(void) { - lcd_quick_feedback(); + lcd_draw_update = 2; return 1; } @@ -294,8 +293,6 @@ uint8_t __attribute__((noinline)) menu_item_function_E(const Sheet &sheet, menu_ if (lcd_draw_update) menu_draw_item_select_sheet_E(' ', sheet); if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; @@ -332,8 +329,6 @@ uint8_t menu_item_function_P(const char* str, menu_func_t func) if (lcd_draw_update) menu_draw_item_puts_P(' ', str); if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; @@ -360,8 +355,6 @@ uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t) if (lcd_draw_update) menu_draw_item_puts_P(' ', str, number); if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = 0; if (func) func(fn_par); lcd_update_enabled = 1; @@ -386,8 +379,6 @@ uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func } else // do the actual toggling { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; @@ -499,7 +490,7 @@ static void _menu_edit_P(void) lcd_set_cursor(0, 1); menu_draw_P(' ', _md->editLabel, (int)lcd_encoder); } - if (LCD_CLICKED) + if (lcd_clicked()) { *((T)(_md->editValue)) = lcd_encoder; menu_back_no_reset(); diff --git a/Firmware/menu.h b/Firmware/menu.h index cb4101e10..e8a348d3b 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -64,7 +64,7 @@ extern menu_func_t menu_menu; extern void menu_data_reset(void); -extern void menu_goto(menu_func_t menu, const uint32_t encoder, const bool feedback, bool reset_menu_state); +extern void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback=false); #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0; void menu_start(void); @@ -78,8 +78,8 @@ extern void menu_back(uint8_t nLevel); extern void menu_back_if_clicked(void); -extern void menu_submenu(menu_func_t submenu); -extern void menu_submenu_no_reset(menu_func_t submenu); +extern void menu_submenu(menu_func_t submenu, const bool feedback=false); +extern void menu_submenu_no_reset(menu_func_t submenu, const bool feedback=false); extern uint8_t menu_item_ret(void); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cc10eae9f..524b5e2c0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -296,8 +296,6 @@ uint8_t menu_item_sddir(const char* str_fn, char* str_fnl) } if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = false; menu_action_sddirectory(str_fn); lcd_update_enabled = true; @@ -318,8 +316,6 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl) } if (menu_clicked && (lcd_encoder == menu_item)) { - menu_clicked = false; - lcd_consume_click(); lcd_update_enabled = false; menu_action_sdfile(str_fn); lcd_update_enabled = true; @@ -762,7 +758,7 @@ void lcd_status_screen() // NOT static due to using ins lcd_commands(); } - bool current_click = LCD_CLICKED; + bool current_click = lcd_clicked(); if (ignore_click) { @@ -775,7 +771,7 @@ void lcd_status_screen() // NOT static due to using ins } else if (current_click) { - lcd_quick_feedback(); + lcd_draw_update = 2; wait_for_unclick = true; current_click = false; } @@ -852,7 +848,7 @@ void lcd_commands() case 10: lcd_clear(); menu_depth = 0; - menu_submenu(lcd_babystep_z); + menu_submenu(lcd_babystep_z, true); lay1cal_intro_line(extraPurgeNeeded, layer_height, extrusion_width); break; case 9: @@ -1018,7 +1014,7 @@ void lcd_commands() void lcd_return_to_status() { lcd_refresh(); // to maybe revive the LCD if static electricity killed it. - menu_goto(lcd_status_screen, 0, false, true); + menu_goto(lcd_status_screen, 0, true); menu_depth = 0; eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } @@ -1896,7 +1892,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) case FilamentAction::Load: case FilamentAction::AutoLoad: case FilamentAction::UnLoad: - if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt); + if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt, true); else { nLevel = bFilamentPreheatState ? 1 : 2; @@ -1915,13 +1911,13 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nLevel = bFilamentPreheatState ? 1 : 2; bFilamentAction = true; menu_back(nLevel); - menu_submenu(mmu_load_to_nozzle_menu); + menu_submenu(mmu_load_to_nozzle_menu, true); break; case FilamentAction::MmuLoadingTest: nLevel = bFilamentPreheatState ? 1 : 2; bFilamentAction = true; menu_back(nLevel); - menu_submenu(mmu_loading_test_menu); + menu_submenu(mmu_loading_test_menu, true); break; case FilamentAction::MmuUnLoad: nLevel = bFilamentPreheatState ? 1 : 2; @@ -1933,14 +1929,14 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nLevel = bFilamentPreheatState ? 1 : 2; bFilamentAction = true; menu_back(nLevel); - menu_submenu(mmu_fil_eject_menu); + menu_submenu(mmu_fil_eject_menu, true); break; case FilamentAction::MmuCut: #ifdef MMU_HAS_CUTTER nLevel=bFilamentPreheatState?1:2; bFilamentAction=true; menu_back(nLevel); - menu_submenu(mmu_cut_filament_menu); + menu_submenu(mmu_cut_filament_menu, true); #endif //MMU_HAS_CUTTER break; case FilamentAction::None: @@ -2418,7 +2414,7 @@ static void _lcd_move(const char *name, uint8_t axis, int min, int max) menu_draw_float31(name, current_position[axis]); } if (menu_leaving || LCD_CLICKED) (void)enable_endstops(_md->endstopsEnabledPrevious); - if (LCD_CLICKED) menu_back(); + menu_back_if_clicked(); } @@ -2444,7 +2440,7 @@ void lcd_move_e() // the implementation of menu_draw_float31 menu_draw_float31(PSTR("Extruder:"), current_position[E_AXIS]); } - if (LCD_CLICKED) menu_back(); + menu_back_if_clicked(); } else { @@ -2651,7 +2647,7 @@ static void lcd_babystep_z() #endif //PINDA_THERMISTOR calibration_status_set(CALIBRATION_STATUS_LIVE_ADJUST); } - if (LCD_CLICKED) menu_back(); + menu_back_if_clicked(); } @@ -3263,7 +3259,7 @@ static void lcd_show_end_stops() { static void menu_show_end_stops() { lcd_show_end_stops(); - if (LCD_CLICKED) menu_back(); + menu_back_if_clicked(); } void lcd_diag_show_end_stops() @@ -3626,7 +3622,7 @@ void lcd_first_layer_calibration_reset() static_assert(sizeof(menu_data)>= sizeof(MenuData),"_menu_data_t doesn't fit into menu_data"); MenuData* menuData = (MenuData*)&(menu_data[0]); - if(LCD_CLICKED || !eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) || + if(lcd_clicked() || !eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) || (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) || (0 == static_cast(eeprom_read_word(reinterpret_cast (&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset))))) @@ -3635,7 +3631,7 @@ void lcd_first_layer_calibration_reset() { eeprom_update_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset), 0xffff); } - menu_goto(lcd_v2_calibration,0,true,true); + menu_goto(lcd_v2_calibration, 0, true, true); } if (lcd_encoder > 0) @@ -3961,7 +3957,7 @@ void lcd_wizard(WizState state) } break; case S::Preheat: - menu_goto(lcd_preheat_menu,0,false,true); + menu_goto(lcd_preheat_menu, 0, true); lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////MSG_SEL_PREHEAT_TEMP c=20 r=6 end = true; // Leave wizard temporarily for lcd_preheat_menu break; @@ -3976,7 +3972,7 @@ void lcd_wizard(WizState state) break; case S::Lay1CalCold: wizard_lay1cal_message(true); - menu_goto(lcd_v2_calibration,0,false,true); + menu_goto(lcd_v2_calibration, 0, true); end = true; // Leave wizard temporarily for lcd_v2_calibration break; case S::Lay1CalHot: @@ -4816,36 +4812,36 @@ char reset_menu() { delay_keep_alive(0); if (lcd_encoder) { - if (lcd_encoder > 0) { - cursor_pos--; - } + if (lcd_encoder > 0) { + cursor_pos--; + } - if (lcd_encoder < 0) { - cursor_pos++; - } + if (lcd_encoder < 0) { + cursor_pos++; + } - if (cursor_pos > 3) { - cursor_pos = 3; - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); - if (first < (uint8_t)(sizeof(item) / sizeof(item[0])) - 4) { - first++; - lcd_clear(); - } - } + if (cursor_pos > 3) { + cursor_pos = 3; + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); + if (first < (uint8_t)(sizeof(item) / sizeof(item[0])) - 4) { + first++; + lcd_clear(); + } + } - if (cursor_pos < 0) { - cursor_pos = 0; - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); - if (first > 0) { - first--; - lcd_clear(); - } - } - lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); - lcd_set_cursor(0, cursor_pos); - lcd_putc('>'); - lcd_encoder = 0; - _delay(100); + if (cursor_pos < 0) { + cursor_pos = 0; + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); + if (first > 0) { + first--; + lcd_clear(); + } + } + lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); + lcd_set_cursor(0, cursor_pos); + lcd_putc('>'); + lcd_encoder = 0; + _delay(100); } if (lcd_clicked()) { @@ -5455,7 +5451,7 @@ static void lcd_advance_edit_K(void) lcd_set_cursor(0, 1); lcd_advance_draw_K(' ', 0.01 * lcd_encoder); } - if (LCD_CLICKED) + if (lcd_clicked()) { extruder_advance_K = 0.01 * lcd_encoder; menu_back_no_reset(); @@ -5834,7 +5830,7 @@ void lcd_sdcard_menu() _md->lcd_scrollTimer.start(); lcd_draw_update = 1; //forces last load before switching to scrolling. } - if (lcd_draw_update == 0 && !LCD_CLICKED) + if (lcd_draw_update == 0 && !lcd_clicked()) return; // nothing to do (so don't thrash the SD card) _md->row = -1; // assume that no SD file/dir is currently selected. Once they are rendered, it will be changed to the correct row for the _scrolling state. @@ -5885,7 +5881,7 @@ void lcd_sdcard_menu() } break; case _scrolling: //scrolling filename { - const bool rewindFlag = LCD_CLICKED || lcd_draw_update; //flag that says whether the menu should return to _standard state. + const bool rewindFlag = lcd_clicked() || lcd_draw_update; //flag that says whether the menu should return to _standard state. if (_md->scrollPointer == NULL) { @@ -5898,7 +5894,7 @@ void lcd_sdcard_menu() _md->scrollPointer = (card.longFilename[0] == '\0') ? card.filename : card.longFilename; } - if (rewindFlag == 1) + if (rewindFlag) _md->offset = 0; //redraw once again from the beginning. if (_md->lcd_scrollTimer.expired(300) || rewindFlag) { @@ -6925,7 +6921,6 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, KEEPALIVE_STATE(PAUSED_FOR_USER); - lcd_button_pressed = false; do { if (lcd_encoder) { @@ -6944,7 +6939,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, lcd_putc_at(0, 3, '>'); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } - lcd_encoder = 0; + lcd_encoder = 0; } @@ -7360,13 +7355,13 @@ void menu_lcd_longpress_func(void) if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z || menu_block_mask != MENU_BLOCK_NONE || Stopped) { // disable longpress during re-entry, while homing, calibration or if a serious error - lcd_quick_feedback(); + lcd_draw_update = 2; return; } if (menu_menu == lcd_hw_setup_menu) { // only toggle the experimental menu visibility flag - lcd_quick_feedback(); + lcd_draw_update = 2; eeprom_toggle((uint8_t *)EEPROM_EXPERIMENTAL_VISIBILITY); return; } @@ -7452,7 +7447,7 @@ void menu_lcd_lcdupdate_func(void) } LCD_MESSAGERPGM(MSG_WELCOME); bMain=false; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function - menu_submenu(lcd_sdcard_menu); + menu_submenu(lcd_sdcard_menu, true); lcd_timeoutToStatus.start(); } else @@ -7464,14 +7459,7 @@ void menu_lcd_lcdupdate_func(void) #endif//CARDINSERTED if (lcd_next_update_millis < _millis()) { - if (lcd_encoder) - { - if (lcd_draw_update == 0) lcd_draw_update = 1; - lcd_timeoutToStatus.start(); - } - - if (LCD_CLICKED) - { + if (lcd_draw_update) { lcd_timeoutToStatus.start(); } From ffc34edf4cd23c667c1ac6444f81611d1de8e4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 17:16:19 +0000 Subject: [PATCH 102/240] Pull in changes from PR 4080 Additionally make lcd_encoder_bits static since it's not used outside the ISR context --- Firmware/lcd.cpp | 62 +++++++++++++++++------------------------------- Firmware/lcd.h | 2 -- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 91ea95493..0c91111ff 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -633,7 +633,7 @@ void lcd_printNumber(unsigned long n, uint8_t base) uint8_t lcd_draw_update = 2; int32_t lcd_encoder = 0; -uint8_t lcd_encoder_bits = 0; + static int8_t lcd_encoder_diff = 0; uint8_t lcd_buttons = 0; @@ -753,7 +753,8 @@ bool lcd_longpress_trigger = 0; void lcd_buttons_update(void) { static uint8_t lcd_long_press_active = 0; - static uint8_t lcd_button_pressed = 0; + static uint8_t lcd_button_pressed = 0; + static uint8_t lcd_encoder_bits = 0; if (READ(BTN_ENC) == 0) { //button is pressed if (buttonBlanking.expired_cont(BUTTON_BLANKING_TIME)) { @@ -785,45 +786,26 @@ void lcd_buttons_update(void) } } - //manage encoder rotation - uint8_t enc = 0; - if (READ(BTN_EN1) == 0) enc |= B01; - if (READ(BTN_EN2) == 0) enc |= B10; - if (enc != lcd_encoder_bits) - { - switch (enc) - { - case encrot0: - if (lcd_encoder_bits == encrot3) - lcd_encoder_diff++; - else if (lcd_encoder_bits == encrot1) - lcd_encoder_diff--; - break; - case encrot1: - if (lcd_encoder_bits == encrot0) - lcd_encoder_diff++; - else if (lcd_encoder_bits == encrot2) - lcd_encoder_diff--; - break; - case encrot2: - if (lcd_encoder_bits == encrot1) - lcd_encoder_diff++; - else if (lcd_encoder_bits == encrot3) - lcd_encoder_diff--; - break; - case encrot3: - if (lcd_encoder_bits == encrot2) - lcd_encoder_diff++; - else if (lcd_encoder_bits == encrot0) - lcd_encoder_diff--; - break; - } + //manage encoder rotation + #define ENCODER_SPIN(_E1, _E2) switch (lcd_encoder_bits) { case _E1: lcd_encoder_diff++; break; case _E2: lcd_encoder_diff--; } + uint8_t enc = 0; + if (READ(BTN_EN1) == 0) enc |= B01; + if (READ(BTN_EN2) == 0) enc |= B10; + if (enc != lcd_encoder_bits) + { + switch (enc) + { + case encrot0: ENCODER_SPIN(encrot3, encrot1); break; + case encrot1: ENCODER_SPIN(encrot0, encrot2); break; + case encrot2: ENCODER_SPIN(encrot1, encrot3); break; + case encrot3: ENCODER_SPIN(encrot2, encrot0); break; + } - if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { - lcd_backlight_wake_trigger = true; // flag event, knob rotated - } - lcd_encoder_bits = enc; - } + if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + lcd_backlight_wake_trigger = true; // flag event, knob rotated + } + lcd_encoder_bits = enc; + } } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 538095dd9..b8ece4e77 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -100,8 +100,6 @@ extern uint8_t lcd_draw_update; extern int32_t lcd_encoder; -extern uint8_t lcd_encoder_bits; - //the last checked lcd_buttons in a bit array. extern uint8_t lcd_buttons; From 1b9379b328831d49c3c9892e2b829c2a90cee74f Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 28 Aug 2022 16:14:40 +0300 Subject: [PATCH 103/240] PSU_DELTA alternative --- Firmware/tmc2130.cpp | 5 +++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index ae1539970..99bc3f5a4 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -12,6 +12,7 @@ #define TMC2130_GCONF_NORMAL 0x00000000 // spreadCycle #define TMC2130_GCONF_SGSENS 0x00000180 // spreadCycle with stallguard (stall activates DIAG0 and DIAG1 [open collector]) +#define TMC2130_GCONF_DYNAMIC_SGSENS 0x00000184 // stealthChop/spreadCycle (dynamic) with stallguard (stall activates DIAG0 and DIAG1 [open collector]) #define TMC2130_GCONF_SILENT 0x00000004 // stealthChop @@ -182,9 +183,9 @@ void tmc2130_init(TMCInitParams params) #else //TMC2130_STEALTH_Z tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, (tmc2130_mode == TMC2130_MODE_SILENT)?0:__tcoolthrs(axis)); - tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_SGSENS); + tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_DYNAMIC_SGSENS); tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); - tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); + tmc2130_wr_TPWMTHRS(axis, (tmc2130_mode == TMC2130_MODE_SILENT)?0:0xFFFF0); #endif //TMC2130_STEALTH_Z } for (uint_least8_t axis = 3; axis < 4; axis++) // E axis diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index e2d4457e8..28e4842af 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -28,7 +28,7 @@ #define HAS_SECOND_SERIAL_PORT // PSU -#define PSU_Delta // uncomment if DeltaElectronics PSU installed +// #define PSU_Delta // uncomment if DeltaElectronics PSU installed // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) From 301b2e4384a2e628ab875ae40c9d1fd40d1d8b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 13:43:24 +0000 Subject: [PATCH 104/240] Optimisation: Move filAutoLoad to ultralcd We can reuse preheat_or_continue() function Change in memory: Flash: -22 bytes SRAM: 0 bytes --- Firmware/Filament_sensor.cpp | 12 +----------- Firmware/Filament_sensor.h | 4 +--- Firmware/ultralcd.cpp | 5 +++++ Firmware/ultralcd.h | 1 + 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index 761a468b5..f4ec2184f 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -117,7 +117,7 @@ void Filament_sensor::triggerFilamentInserted() { || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) ) ) { - filAutoLoad(); + lcd_AutoLoadFilament(); } } @@ -141,16 +141,6 @@ void Filament_sensor::triggerFilamentRemoved() { } } -void Filament_sensor::filAutoLoad() { - eFilamentAction = FilamentAction::AutoLoad; - if (target_temperature[0] >= EXTRUDE_MINTEMP) { - bFilamentPreheatState = true; - menu_submenu(mFilamentItemForce); - } else { - menu_submenu(lcd_generic_preheat_menu); - lcd_timeoutToStatus.start(); - } -} void Filament_sensor::filRunout() { // SERIAL_ECHOLNPGM("filRunout"); diff --git a/Firmware/Filament_sensor.h b/Firmware/Filament_sensor.h index e5c488a3a..f715f8618 100644 --- a/Firmware/Filament_sensor.h +++ b/Firmware/Filament_sensor.h @@ -69,9 +69,7 @@ protected: void triggerFilamentInserted(); void triggerFilamentRemoved(); - - static void filAutoLoad(); - + void filRunout(); void triggerError(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 524b5e2c0..50508ec3e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2302,6 +2302,11 @@ static void lcd_LoadFilament() preheat_or_continue(); } +void lcd_AutoLoadFilament() { + eFilamentAction = FilamentAction::AutoLoad; + preheat_or_continue(); +} + //! @brief Show filament used a print time //! diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index b398f6a91..ab739a253 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -200,6 +200,7 @@ void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItemForce(); void lcd_generic_preheat_menu(); void unload_filament(float unloadLength); +void lcd_AutoLoadFilament(); void lcd_wait_for_heater(); From 210bbe97641372636e0917efdb999b8f4192840b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 13:46:50 +0000 Subject: [PATCH 105/240] Remove dead code --- Firmware/ultralcd.cpp | 6 ------ Firmware/ultralcd.h | 1 - 2 files changed, 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 50508ec3e..85b2ef1ad 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2129,12 +2129,6 @@ void lcd_generic_preheat_menu() MENU_END(); } -void mFilamentItemForce() -{ -mFilamentItem(target_temperature[0],target_temperature_bed); -} - - void lcd_unLoadFilament() { eFilamentAction=FilamentAction::UnLoad; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index ab739a253..833e2c835 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -197,7 +197,6 @@ extern FilamentAction eFilamentAction; extern bool bFilamentPreheatState; extern bool bFilamentAction; void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); -void mFilamentItemForce(); void lcd_generic_preheat_menu(); void unload_filament(float unloadLength); void lcd_AutoLoadFilament(); From 68d902c4e122162e84fac365284fa2488d48a781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 14:14:43 +0000 Subject: [PATCH 106/240] Take FilamentAction as parameter Change in memory: Flash: -28 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 85b2ef1ad..95e39b092 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -124,7 +124,7 @@ static void lcd_v2_calibration(); static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); static void mmu_loading_test_menu(); -static void preheat_or_continue(); +static void preheat_or_continue(FilamentAction action); #ifdef MMU_HAS_CUTTER static void mmu_cut_filament_menu(); @@ -2129,16 +2129,14 @@ void lcd_generic_preheat_menu() MENU_END(); } -void lcd_unLoadFilament() +static void lcd_unLoadFilament() { - eFilamentAction=FilamentAction::UnLoad; - preheat_or_continue(); + preheat_or_continue(FilamentAction::UnLoad); } static void mmu_unload_filament() { - eFilamentAction = FilamentAction::MmuUnLoad; - preheat_or_continue(); + preheat_or_continue(FilamentAction::MmuUnLoad); } @@ -2281,7 +2279,8 @@ static void lcd_menu_AutoLoadFilament() } #endif //FILAMENT_SENSOR -static void preheat_or_continue() { +static void preheat_or_continue(FilamentAction action) { + eFilamentAction = action; if (target_temperature[0] >= extrude_min_temp) { bFilamentPreheatState = true; mFilamentItem(target_temperature[0], target_temperature_bed); @@ -2292,13 +2291,11 @@ static void preheat_or_continue() { static void lcd_LoadFilament() { - eFilamentAction = FilamentAction::Load; - preheat_or_continue(); + preheat_or_continue(FilamentAction::Load); } void lcd_AutoLoadFilament() { - eFilamentAction = FilamentAction::AutoLoad; - preheat_or_continue(); + preheat_or_continue(FilamentAction::AutoLoad); } @@ -4901,8 +4898,7 @@ static void mmu_load_to_nozzle_menu() { MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 MENU_END(); } else { - eFilamentAction = FilamentAction::MmuLoad; - preheat_or_continue(); + preheat_or_continue(FilamentAction::MmuLoad); } } @@ -4919,8 +4915,7 @@ static void mmu_fil_eject_menu() { 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; - preheat_or_continue(); + preheat_or_continue(FilamentAction::MmuEject); } } @@ -4937,8 +4932,7 @@ static void mmu_cut_filament_menu() { MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 MENU_END(); } else { - eFilamentAction=FilamentAction::MmuCut; - preheat_or_continue(); + preheat_or_continue(FilamentAction::MmuCut); } } #endif //MMU_HAS_CUTTER @@ -4962,8 +4956,7 @@ static void mmu_loading_test_menu() { MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 MENU_END(); } else { - eFilamentAction = FilamentAction::MmuLoadingTest; - preheat_or_continue(); + preheat_or_continue(FilamentAction::MmuLoadingTest); } } From b9717b03e7c4d3b7855fd3886e7da45a124a0206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 14:16:44 +0000 Subject: [PATCH 107/240] Make bFilament variables static and move to top of file --- Firmware/ultralcd.cpp | 10 +++++----- Firmware/ultralcd.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 95e39b092..0bf805c88 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -57,6 +57,11 @@ static void lcd_mesh_bed_leveling_settings(); static void lcd_backlight_menu(); #endif +FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad' +static bool bFilamentPreheatState; +static bool bFilamentAction = false; +static bool bFilamentWaitingFlag = false; + int8_t ReInitLCD = 0; uint8_t scrollstuff = 0; @@ -1756,11 +1761,6 @@ void lcd_cutter_enabled() } #endif //MMU_HAS_CUTTER -FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad' -bool bFilamentPreheatState; -bool bFilamentAction=false; -static bool bFilamentWaitingFlag=false; - bool shouldPreheatOnlyNozzle() { uint8_t eeprom_setting = eeprom_read_byte((uint8_t*)EEPROM_HEAT_BED_ON_LOAD_FILAMENT); if (eeprom_setting != 0) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 833e2c835..04ac697f1 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -194,8 +194,6 @@ enum class FilamentAction : uint_least8_t }; extern FilamentAction eFilamentAction; -extern bool bFilamentPreheatState; -extern bool bFilamentAction; void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void lcd_generic_preheat_menu(); void unload_filament(float unloadLength); From 768319f1e72f239853e0d1c5f19fae2f8e66e6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 09:47:37 +0000 Subject: [PATCH 108/240] optimisation: cleanup print statistics Change in memory: Flash: -104 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 8 ++++++-- Firmware/Marlin_main.cpp | 8 ++++---- Firmware/Prusa_farm.cpp | 2 +- Firmware/cmdqueue.cpp | 6 +++--- Firmware/eeprom.h | 4 ++-- Firmware/ultralcd.cpp | 12 +++++++----- 6 files changed, 23 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 53f415b9d..02f8d25d6 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -312,8 +312,12 @@ extern ShortTimer usb_timer; extern bool processing_tcode; extern bool homing_flag; extern bool loading_flag; -extern unsigned long total_filament_used; -void save_statistics(unsigned long _total_filament_used, unsigned long _total_print_time); +extern uint32_t total_filament_used; // mm/100 or 10um + +/// @brief Save print statistics to EEPROM +/// @param _total_filament_used has unit mm/100 or 10um +/// @param _total_print_time has unit minutes, for example 123 minutes +void save_statistics(uint32_t _total_filament_used, uint32_t _total_print_time); extern uint8_t heating_status_counter; extern bool fan_state[2]; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6cec34683..3ad026e77 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -183,7 +183,7 @@ static LongTimer crashDetTimer; bool mesh_bed_leveling_flag = false; -unsigned long total_filament_used; +uint32_t total_filament_used; HeatingStatus heating_status; uint8_t heating_status_counter; bool loading_flag = false; @@ -9691,11 +9691,11 @@ void setPwmFrequency(uint8_t pin, int val) } #endif //FAST_PWM_FAN -void save_statistics(unsigned long _total_filament_used, unsigned long _total_print_time) { //_total_filament_used unit: mm/100; print time in s - uint32_t _previous_filament = eeprom_init_default_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); //_previous_filament unit: cm +void save_statistics(uint32_t _total_filament_used, uint32_t _total_print_time) { + uint32_t _previous_filament = eeprom_init_default_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); //_previous_filament unit: meter uint32_t _previous_time = eeprom_init_default_dword((uint32_t *)EEPROM_TOTALTIME, 0); //_previous_time unit: min - eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, _previous_time + (_total_print_time / 60)); // EEPROM_TOTALTIME unit: min + eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, _previous_time + _total_print_time); // EEPROM_TOTALTIME unit: min eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, _previous_filament + (_total_filament_used / 1000)); total_filament_used = 0; diff --git a/Firmware/Prusa_farm.cpp b/Firmware/Prusa_farm.cpp index 642e811ec..c82989ad5 100644 --- a/Firmware/Prusa_farm.cpp +++ b/Firmware/Prusa_farm.cpp @@ -92,7 +92,7 @@ static void prusa_stat_printinfo() { SERIAL_ECHO(card.longFilename[0] ? card.longFilename : card.filename); SERIAL_ECHOPGM("][TIM:"); if (starttime != 0) { - SERIAL_ECHO(_millis() / 1000 - starttime / 1000); + SERIAL_ECHO((_millis() - starttime) / 1000); } else { SERIAL_ECHO(0); diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 53f5f5d2b..aa7938de3 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -640,11 +640,11 @@ void get_command() SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED stoptime=_millis(); char time[30]; - unsigned long t=(stoptime-starttime-pause_time)/1000; + uint32_t t = (stoptime-starttime-pause_time) / 60000; pause_time = 0; int hours, minutes; - minutes=(t/60)%60; - hours=t/60/60; + minutes = t % 60; + hours = t / 60; save_statistics(total_filament_used, t); sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes); SERIAL_ECHO_START; diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 9c74fff27..ae9185eb1 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -97,8 +97,8 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | fah 250 | ^ | needs XYZ calibration | ^ | ^ | ^ | ^ | ^ | 00h 0 | ^ | Unknown (legacy) | ^ | ^ | 0x0FF5 4085 | uint16 | EEPROM_BABYSTEP_Z0 | ??? | ff ffh 65535 | Babystep for Z ??? | ??? | D3 Ax0ff5 C2 -| 0x0FF1 4081 | unint32 | EEPROM_FILAMENTUSED | ??? | 00 00 00 00h 0 __S/P__| Filament used in meters | ??? | D3 Ax0ff1 C4 -| 0x0FED 4077 | unint32 | EEPROM_TOTALTIME | ??? | 00 00 00 00h 0 __S/P__| Total print time | ??? | D3 Ax0fed C4 +| 0x0FF1 4081 | uint32 | EEPROM_FILAMENTUSED | ??? | 00 00 00 00h 0 __S/P__| Filament used in meters | ??? | D3 Ax0ff1 C4 +| 0x0FED 4077 | uint32 | EEPROM_TOTALTIME | ??? | 00 00 00 00h 0 __S/P__| Total print time in minutes | ??? | D3 Ax0fed C4 | 0x0FE5 4069 | float | EEPROM_BED_CALIBRATION_CENTER | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fe5 C8 | 0x0FDD 4061 | float | EEPROM_BED_CALIBRATION_VEC_X | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fdd C8 | 0x0FD5 4053 | float | EEPROM_BED_CALIBRATION_VEC_Y | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fd5 C8 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0bf805c88..c7ea35047 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -498,11 +498,11 @@ void lcdui_print_time(void) print_t = print_tr; suff = 'R'; } else - print_t = _millis() / 60000 - starttime / 60000; + print_t = (_millis() - starttime) / 60000; if (feedmultiply != 100 && (print_t == print_tr || print_t == print_tc)) { suff_doubt = '?'; - print_t = 100ul * print_t / feedmultiply; + print_t = (100 * print_t) / feedmultiply; } if (print_t < 6000) //time<100h @@ -2346,8 +2346,8 @@ void lcd_menu_statistics() } else { - unsigned long _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); - unsigned long _time = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME); //in minutes + uint32_t _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); // in meters + uint32_t _time = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME); // in minutes uint8_t _hours, _minutes; uint32_t _days; float _filament_m = (float)_filament/100; @@ -5672,7 +5672,9 @@ void lcd_print_stop_finish() { // save printing time stoptime = _millis(); - unsigned long t = (stoptime - starttime - pause_time) / 1000; //time in s + + // Convert the time from ms to minutes, divide by 60 * 1000 + uint32_t t = (stoptime - starttime - pause_time) / 60000; save_statistics(total_filament_used, t); // lift Z From ee39cb4e9039e68ccb33d40c1063db26cfcff1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 10:13:13 +0000 Subject: [PATCH 109/240] remove one global variable --- Firmware/Marlin.h | 10 +++------- Firmware/Marlin_main.cpp | 18 ++++++++---------- Firmware/cmdqueue.cpp | 3 +-- Firmware/ultralcd.cpp | 5 +---- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 02f8d25d6..d66424086 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -306,8 +306,9 @@ extern float retract_recover_length_swap; extern uint8_t host_keepalive_interval; -extern unsigned long starttime; -extern unsigned long stoptime; +extern uint32_t starttime; // milliseconds +extern uint32_t pause_time; // milliseconds +extern uint32_t start_pause_print; // milliseconds extern ShortTimer usb_timer; extern bool processing_tcode; extern bool homing_flag; @@ -328,11 +329,6 @@ extern int fan_speed[2]; // We may even remove the references to it wherever possible in the future #define active_extruder 0 -//Long pause -extern unsigned long pause_time; -extern unsigned long start_pause_print; -extern unsigned long t_fan_rising_edge; - extern bool mesh_bed_leveling_flag; // save/restore printing diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3ad026e77..21d0e0536 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -173,9 +173,7 @@ int extrudemultiply=100; //100->1 200->2 bool homing_flag = false; -unsigned long pause_time = 0; -unsigned long start_pause_print = _millis(); -unsigned long t_fan_rising_edge = _millis(); +static uint32_t t_fan_rising_edge; LongTimer safetyTimer; static LongTimer crashDetTimer; @@ -306,8 +304,9 @@ unsigned long max_inactive_time = 0; static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; static unsigned long safetytimer_inactive_time = DEFAULT_SAFETYTIMER_TIME_MINS*60*1000ul; -unsigned long starttime=0; -unsigned long stoptime=0; +uint32_t starttime; +uint32_t pause_time; +uint32_t start_pause_print; ShortTimer usb_timer; bool Stopped=false; @@ -5490,12 +5489,11 @@ void process_commands() */ case 31: //M31 take time since the start of the SD print or an M109 command { - stoptime=_millis(); char time[30]; - unsigned long t=(stoptime-starttime)/1000; - int sec,min; - min=t/60; - sec=t%60; + uint32_t t = (_millis() - starttime) / 1000; + int16_t sec, min; + min = t / 60; + sec = t % 60; sprintf_P(time, PSTR("%i min, %i sec"), min, sec); SERIAL_ECHO_START; SERIAL_ECHOLN(time); diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index aa7938de3..76962dffc 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -638,9 +638,8 @@ void get_command() card.closefile(); SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED - stoptime=_millis(); char time[30]; - uint32_t t = (stoptime-starttime-pause_time) / 60000; + uint32_t t = (_millis() - starttime - pause_time) / 60000; pause_time = 0; int hours, minutes; minutes = t % 60; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c7ea35047..0db3623a4 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5670,11 +5670,8 @@ static void lcd_sd_updir() // continue stopping the print from the main loop after lcd_print_stop() is called void lcd_print_stop_finish() { - // save printing time - stoptime = _millis(); - // Convert the time from ms to minutes, divide by 60 * 1000 - uint32_t t = (stoptime - starttime - pause_time) / 60000; + uint32_t t = (_millis() - starttime - pause_time) / 60000; save_statistics(total_filament_used, t); // lift Z From 5b04812017a7c00193766fa4b93156460ab7711a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 29 Jan 2023 10:53:19 +0000 Subject: [PATCH 110/240] Eliminate subtraction in print time statistic Change in memory: Flash: -20 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0db3623a4..8bf7f0047 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2329,9 +2329,9 @@ void lcd_menu_statistics() { const float _met = ((float)total_filament_used) / (100000.f); const uint32_t _t = (_millis() - starttime) / 1000ul; - const uint32_t _h = _t / 3600; - const uint8_t _m = (_t - (_h * 3600ul)) / 60ul; - const uint8_t _s = _t - ((_h * 3600ul) + (_m * 60ul)); + const uint32_t _h = (_t / 60) / 60; + const uint8_t _m = (_t / 60) % 60; + const uint8_t _s = _t % 60; lcd_home(); lcd_printf_P(_N( @@ -2351,9 +2351,9 @@ void lcd_menu_statistics() uint8_t _hours, _minutes; uint32_t _days; float _filament_m = (float)_filament/100; - _days = _time / 1440; - _hours = (_time - (_days * 1440)) / 60; - _minutes = _time - ((_days * 1440) + (_hours * 60)); + _days = (_time / 60) / 24; + _hours = (_time / 60) % 24; + _minutes = _time % 60; lcd_home(); lcd_printf_P(_N( From 5ef00fb78ac67c9d1c11277ff30a4d2adc1d791b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 18:17:36 +0000 Subject: [PATCH 111/240] Reduce code size in first layer calibration Pull out common enqueuing loop into one function Change in memory: Flash: -70 bytes SRAM: 0 bytes --- Firmware/first_lay_cal.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index e36c1592a..37d2dfe38 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -33,6 +33,14 @@ static constexpr float spacing(float layer_height, float extrusion_width, float return extrusion_width - layer_height * (overlap_factor - M_PI/4); } +// Common code extracted into one function to reduce code size +static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence) { + for (uint8_t i = 0; i < (sizeof(cmd_sequence)/sizeof(cmd_sequence[0])); ++i) + { + enquecommand_P(static_cast(pgm_read_ptr(&cmd_sequence[i]))); + } +} + static const char extrude_fmt[] PROGMEM = "G1 X%d Y%d E%-.5f"; static const char zero_extrusion[] PROGMEM = "G92 E0"; @@ -48,10 +56,7 @@ void lay1cal_wait_preheat() zero_extrusion }; - for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) - { - enquecommand_P(preheat_cmd[i]); - } + lay1cal_common_enqueue_loop(preheat_cmd); } //! @brief Load filament @@ -148,10 +153,7 @@ void lay1cal_before_meander() cmd_pre_meander_7, }; - for (uint8_t i = 0; i < (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])); ++i) - { - enquecommand_P(static_cast(pgm_read_ptr(&cmd_pre_meander[i]))); - } + lay1cal_common_enqueue_loop(cmd_pre_meander); } //! @brief Print meander start @@ -237,10 +239,7 @@ void lay1cal_finish(bool mmu_enabled) cmd_cal_finish_5 }; - for (uint8_t i = 0; i < (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0])); ++i) - { - enquecommand_P(static_cast(pgm_read_ptr(&cmd_cal_finish[i]))); - } + lay1cal_common_enqueue_loop(cmd_cal_finish); if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle enquecommand_P(MSG_M84);// disable motors From 7ad137e570140c9425f976de628f87417c11137c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 18:39:29 +0000 Subject: [PATCH 112/240] Add preheat_cmd into PROGMEM Change in memory: Flash: -30 bytes SRAM: 0 bytes --- Firmware/first_lay_cal.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 37d2dfe38..be92f0d20 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -47,12 +47,16 @@ static const char zero_extrusion[] PROGMEM = "G92 E0"; //! @brief Wait for preheat void lay1cal_wait_preheat() { - const char * const preheat_cmd[] = + static const char preheat_cmd_2[] PROGMEM = "M190"; + static const char preheat_cmd_3[] PROGMEM = "M109"; + static const char preheat_cmd_4[] PROGMEM = "G28"; + + static const char * const preheat_cmd[] PROGMEM = { MSG_M107, - PSTR("M190"), - PSTR("M109"), - PSTR("G28"), + preheat_cmd_2, + preheat_cmd_3, + preheat_cmd_4, zero_extrusion }; From 76a8c80ef0bde753ac51e3d74a64a21bea8803d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Mar 2023 11:01:31 +0000 Subject: [PATCH 113/240] Fix issue with size being wrong at runtime Change in memory: Flash: +40 bytes SRAM: 0 bytes --- Firmware/first_lay_cal.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index be92f0d20..0ad7ca5c9 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -34,10 +34,10 @@ static constexpr float spacing(float layer_height, float extrusion_width, float } // Common code extracted into one function to reduce code size -static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence) { - for (uint8_t i = 0; i < (sizeof(cmd_sequence)/sizeof(cmd_sequence[0])); ++i) +static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence, const uint8_t steps) { + for (uint8_t i = 0; i < steps; ++i) { - enquecommand_P(static_cast(pgm_read_ptr(&cmd_sequence[i]))); + enquecommand_P(static_cast(pgm_read_ptr(cmd_sequence + i))); } } @@ -60,7 +60,7 @@ void lay1cal_wait_preheat() zero_extrusion }; - lay1cal_common_enqueue_loop(preheat_cmd); + lay1cal_common_enqueue_loop(preheat_cmd, sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); } //! @brief Load filament @@ -157,7 +157,7 @@ void lay1cal_before_meander() cmd_pre_meander_7, }; - lay1cal_common_enqueue_loop(cmd_pre_meander); + lay1cal_common_enqueue_loop(cmd_pre_meander, (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0]))); } //! @brief Print meander start @@ -243,7 +243,7 @@ void lay1cal_finish(bool mmu_enabled) cmd_cal_finish_5 }; - lay1cal_common_enqueue_loop(cmd_cal_finish); + lay1cal_common_enqueue_loop(cmd_cal_finish, (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0]))); if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle enquecommand_P(MSG_M84);// disable motors From 2ced00f21c571e7d2eeb7c824b55ff492c3ebbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 27 Jan 2023 21:12:58 +0000 Subject: [PATCH 114/240] Convert fanSpeed and saved_fan_speed to uint8_t These variables only range from 0 to 255 For the menus we currently need to convert fanSpeed to int16_t. Change in memory: Flash: -160 bytes SRAM: -2 bytes --- Firmware/Marlin.h | 4 ++-- Firmware/Marlin_main.cpp | 10 +++++----- Firmware/planner.cpp | 10 +++++----- Firmware/ultralcd.cpp | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index d66424086..ddb758a12 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -278,7 +278,7 @@ extern float destination[NUM_AXIS] ; extern float min_pos[3]; extern float max_pos[3]; extern bool axis_known_position[3]; -extern int fanSpeed; +extern uint8_t fanSpeed; //!< Print fan speed, ranges from 0 to 255 extern uint8_t newFanSpeed; extern float default_retraction; @@ -340,7 +340,7 @@ extern uint8_t saved_printing_type; extern float saved_extruder_temperature; //!< Active extruder temperature extern float saved_bed_temperature; //!< Bed temperature -extern int saved_fan_speed; //!< Print fan speed +extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 //estimated time to end of the print extern uint8_t print_percent_done_normal; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 21d0e0536..6a3565123 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -214,7 +214,7 @@ float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS }; float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS }; bool axis_known_position[3] = {false, false, false}; -int fanSpeed=0; +uint8_t fanSpeed = 0; uint8_t newFanSpeed = 0; #ifdef FWRETRACT @@ -335,7 +335,7 @@ static int saved_feedmultiply2 = 0; float saved_extruder_temperature = 0.0; //!< Active extruder temperature float saved_bed_temperature = 0.0; static bool saved_extruder_relative_mode = false; -int saved_fan_speed = 0; //!< Print fan speed +uint8_t saved_fan_speed = 0; //!< Print fan speed //! @} static int saved_feedmultiply_mm = 100; @@ -3410,7 +3410,7 @@ void gcode_M114() #if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) void gcode_M123() { - printf_P(_N("E0:%d RPM PRN1:%d RPM E0@:%u PRN1@:%d\n"), 60*fan_speed[active_extruder], 60*fan_speed[1], newFanSpeed, fanSpeed); + printf_P(_N("E0:%d RPM PRN1:%d RPM E0@:%u PRN1@:%u\n"), 60*fan_speed[active_extruder], 60*fan_speed[1], newFanSpeed, fanSpeed); } #endif //FANCHECK and TACH_0 or TACH_1 @@ -3476,7 +3476,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float //First backup current position and settings int feedmultiplyBckp = feedmultiply; float HotendTempBckp = degTargetHotend(active_extruder); - int fanSpeedBckp = fanSpeed; + uint8_t fanSpeedBckp = fanSpeed; memcpy(lastpos, current_position, sizeof(lastpos)); @@ -9563,7 +9563,7 @@ void ThermalStop(bool allow_recovery) // original values after the pause handler is called. float bed_temp = saved_bed_temperature; float ext_temp = saved_extruder_temperature; - int fan_speed = saved_fan_speed; + uint8_t fan_speed = saved_fan_speed; lcd_pause_print(); saved_bed_temperature = bed_temp; saved_extruder_temperature = ext_temp; diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index c49d26f7b..46b679793 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -530,11 +530,11 @@ bool e_active() void check_axes_activity() { - unsigned char x_active = 0; - unsigned char y_active = 0; - unsigned char z_active = 0; - unsigned char e_active = 0; - unsigned char tail_fan_speed = fanSpeed; + uint8_t x_active = 0; + uint8_t y_active = 0; + uint8_t z_active = 0; + uint8_t e_active = 0; + uint8_t tail_fan_speed = fanSpeed; block_t *block; if(block_buffer_tail != block_buffer_head) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8bf7f0047..6b00b344d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2776,7 +2776,7 @@ void lcd_wait_for_heater() { void lcd_wait_for_cool_down() { setTargetHotend(0); setTargetBed(0); - int fanSpeedBckp = fanSpeed; + uint8_t fanSpeedBckp = fanSpeed; fanSpeed = 255; while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) { lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=4 @@ -5508,7 +5508,7 @@ static void lcd_tune_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10); - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255);//5 + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), (int16_t*)&fanSpeed, 0, 255);//5 MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=15 #ifdef LA_LIVE_K MENU_ITEM_EDIT_advance_K();//7 @@ -5633,7 +5633,7 @@ static void lcd_control_temperature_menu() #if TEMP_SENSOR_BED != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); #endif - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), (int16_t*)&fanSpeed, 0, 255); #if defined AUTOTEMP && (TEMP_SENSOR_0 != 0) //MENU_ITEM_EDIT removed, following code must be redesigned if AUTOTEMP enabled MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled); From 876ea6c2289da667b96c1545685c138862780e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 27 Jan 2023 21:40:55 +0000 Subject: [PATCH 115/240] Change block buffer fan speed to one byte It's only assigned to variables which are uint8_t Change in memory: Flash: -10 bytes SRAM: -16 bytes --- Firmware/planner.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/planner.h b/Firmware/planner.h index 5c4828146..8785e794e 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -103,8 +103,7 @@ typedef struct { uint32_t initial_rate; // The jerk-adjusted step rate at start of block uint32_t final_rate; // The minimal rate at exit uint32_t acceleration_steps_per_s2; // acceleration steps/sec^2 - //FIXME does it have to be int? Probably uint8_t would be just fine. Need to change in other places as well - int fan_speed; + uint8_t fan_speed; // Print fan speed, ranges from 0 to 255 volatile char busy; From c754c8dd5f9dc446abbe30d629f9270b65b60225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 4 Mar 2023 20:22:47 +0000 Subject: [PATCH 116/240] Remove menu code in favor of simplicity This change needs to be approved of course due to it affecting UI The affect UI is only one menu lcd_settings_linearity_correction_menu I doubt many users are using this menu except very advanced users. I propose we delete the variant of menu_draw_P which was used for uint8_t but renders them as floats. Instead treat uint8_t same as int16_t i.e. just render integers. Keeping it simple :) Solve our fanSpeed problem. Change in memory: Flash: -140 bytes SRAM: -2 bytes --- Firmware/backlight.cpp | 8 ++++---- Firmware/backlight.h | 4 ++-- Firmware/menu.cpp | 29 +++++++---------------------- Firmware/menu.h | 3 +++ Firmware/ultralcd.cpp | 4 ++-- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index ef7206d26..ae9122160 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -14,8 +14,8 @@ #define BL_FLASH_DELAY_MS 25 bool backlightSupport = 0; //only if it's true will any of the settings be visible to the user -int16_t backlightLevel_HIGH = 0; -int16_t backlightLevel_LOW = 0; +uint8_t backlightLevel_HIGH = 0; +uint8_t backlightLevel_LOW = 0; uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT; int16_t backlightTimer_period = 10; LongTimer backlightTimer; @@ -62,8 +62,8 @@ void backlight_wake(const uint8_t flashNo) void backlight_save() //saves all backlight data to eeprom. { - eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH); - eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, (uint8_t)backlightLevel_LOW); + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, backlightLevel_HIGH); + eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, backlightLevel_LOW); eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, backlightMode); eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period); } diff --git a/Firmware/backlight.h b/Firmware/backlight.h index d9fdd0ad1..7d1300b62 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -13,8 +13,8 @@ enum Backlight_Mode BACKLIGHT_MODE_AUTO = 2, }; -extern int16_t backlightLevel_HIGH; -extern int16_t backlightLevel_LOW; +extern uint8_t backlightLevel_HIGH; +extern uint8_t backlightLevel_LOW; extern uint8_t backlightMode; extern bool backlightSupport; extern int16_t backlightTimer_period; diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index de80ae7e6..f6614e588 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -162,12 +162,10 @@ static void menu_draw_toggle_puts_P(const char* str, const char* toggle, const u //xxxxxcba //a = selection mark. If it's set(1), then '>' will be used as the first character on the line. Else leave blank //b = toggle string is from progmem - //c = do not set cursor at all. Must be handled externally. uint8_t is_progmem = settings & 0x02; const char eol = (toggle == NULL) ? LCD_STR_ARROW_RIGHT[0] : ' '; if (toggle == NULL) toggle = _T(MSG_NA); uint8_t len = 4 + (is_progmem ? strlen_P(toggle) : strlen(toggle)); - if (!(settings & 0x04)) lcd_set_cursor(0, menu_row); lcd_putc((settings & 0x01) ? '>' : ' '); lcd_print_pad_P(str, LCD_WIDTH - len); lcd_putc('['); @@ -411,11 +409,10 @@ const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; const char menu_fmt_float13[] PROGMEM = "%c%-13.13S%+5.3f"; -template -static void menu_draw_P(char chr, const char* str, int16_t val); -template<> -void menu_draw_P(char chr, const char* str, int16_t val) + +template +void menu_draw_P(char chr, const char* str, T val) { // The LCD row position is controlled externally. We may only modify the column here lcd_putc(chr); @@ -434,20 +431,8 @@ void menu_draw_P(char chr, const char* str, int16_t val) lcd_print(val); } -template<> -void menu_draw_P(char chr, const char* str, int16_t val) -{ - menu_data_edit_t* _md = (menu_data_edit_t*)&(menu_data[0]); - float factor = 1.0f + static_cast(val) / 1000.0f; - if (val <= _md->minEditValue) - { - menu_draw_toggle_puts_P(str, _T(MSG_OFF), 0x04 | 0x02 | (chr=='>')); - } - else - { - lcd_printf_P(menu_fmt_float13, chr, str, factor); - } -} +template void menu_draw_P(char chr, const char* str, int16_t val); +template void menu_draw_P(char chr, const char* str, uint8_t val); //! @brief Draw up to 10 chars of text and a float number in format from +0.0 to +12345.0. The increased range is necessary //! for displaying large values of extruder positions, which caused text overflow in the previous implementation. @@ -488,7 +473,7 @@ static void _menu_edit_P(void) if (lcd_encoder < _md->minEditValue) lcd_encoder = _md->minEditValue; else if (lcd_encoder > _md->maxEditValue) lcd_encoder = _md->maxEditValue; lcd_set_cursor(0, 1); - menu_draw_P(' ', _md->editLabel, (int)lcd_encoder); + menu_draw_P(' ', _md->editLabel, (int)lcd_encoder); } if (lcd_clicked()) { @@ -506,7 +491,7 @@ uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_v if (lcd_draw_update) { lcd_set_cursor(0, menu_row); - menu_draw_P(menu_selection_mark(), str, *pval); + menu_draw_P(menu_selection_mark(), str, *pval); } if (menu_clicked && (lcd_encoder == menu_item)) { diff --git a/Firmware/menu.h b/Firmware/menu.h index e8a348d3b..3c34fdb15 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -146,6 +146,9 @@ extern void menu_format_sheet_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) template extern uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val); +template +extern void menu_draw_P(char chr, const char* str, T val); + extern void menu_progressbar_init(uint16_t total, const char* title); extern void menu_progressbar_update(uint16_t newVal); extern void menu_progressbar_finish(void); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6b00b344d..18010fceb 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5508,7 +5508,7 @@ static void lcd_tune_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10); - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), (int16_t*)&fanSpeed, 0, 255);//5 + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255);//5 MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=15 #ifdef LA_LIVE_K MENU_ITEM_EDIT_advance_K();//7 @@ -5633,7 +5633,7 @@ static void lcd_control_temperature_menu() #if TEMP_SENSOR_BED != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); #endif - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), (int16_t*)&fanSpeed, 0, 255); + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); #if defined AUTOTEMP && (TEMP_SENSOR_0 != 0) //MENU_ITEM_EDIT removed, following code must be redesigned if AUTOTEMP enabled MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled); From 062ea1cf2580d79875979a2f2ef54d44923a05c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 22 Feb 2023 18:26:23 +0000 Subject: [PATCH 117/240] optimisation: make lcd_encoder two bytes (int16_t) lcd_encoder was int32_t (4 bytes) because of the menu code when editing through the menus, the menus only accept int16_t so it doesnt make sense to use int32_t. Change in memory: Flash: -892 bytes SRAM: -2 bytes --- Firmware/lcd.cpp | 6 +++--- Firmware/lcd.h | 2 +- Firmware/menu.cpp | 4 ++-- Firmware/menu.h | 4 ++-- Firmware/ultralcd.cpp | 24 ++++++++++++------------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 0c91111ff..c14ab7934 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -632,9 +632,9 @@ void lcd_printNumber(unsigned long n, uint8_t base) } uint8_t lcd_draw_update = 2; -int32_t lcd_encoder = 0; - -static int8_t lcd_encoder_diff = 0; +int16_t lcd_encoder = 0; +uint8_t lcd_encoder_bits = 0; +int8_t lcd_encoder_diff = 0; uint8_t lcd_buttons = 0; uint8_t lcd_update_enabled = 1; diff --git a/Firmware/lcd.h b/Firmware/lcd.h index b8ece4e77..eee69e97d 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -98,7 +98,7 @@ typedef void (*lcd_lcdupdate_func_t)(void); //Set to none-zero when the LCD needs to draw, decreased after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial) extern uint8_t lcd_draw_update; -extern int32_t lcd_encoder; +extern int16_t lcd_encoder; //the last checked lcd_buttons in a bit array. extern uint8_t lcd_buttons; diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index f6614e588..d20c7b055 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -64,7 +64,7 @@ void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, void menu_start(void) { - if (lcd_encoder > 0x8000) lcd_encoder = 0; + if (lcd_encoder > INT8_MAX) lcd_encoder = 0; if (lcd_encoder < 0) { lcd_encoder = 0; @@ -473,7 +473,7 @@ static void _menu_edit_P(void) if (lcd_encoder < _md->minEditValue) lcd_encoder = _md->minEditValue; else if (lcd_encoder > _md->maxEditValue) lcd_encoder = _md->maxEditValue; lcd_set_cursor(0, 1); - menu_draw_P(' ', _md->editLabel, (int)lcd_encoder); + menu_draw_P(' ', _md->editLabel, lcd_encoder); } if (lcd_clicked()) { diff --git a/Firmware/menu.h b/Firmware/menu.h index 3c34fdb15..7b67bbdf4 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -21,8 +21,8 @@ typedef struct //Variables used when editing values. const char* editLabel; void* editValue; - int32_t minEditValue; - int32_t maxEditValue; + int16_t minEditValue; + int16_t maxEditValue; } menu_data_edit_t; extern uint8_t menu_data[MENU_DATA_SIZE]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 18010fceb..8fb49f464 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -704,25 +704,25 @@ void lcd_status_screen() // NOT static due to using ins static uint8_t lcd_status_update_delay = 0; #ifdef ULTIPANEL_FEEDMULTIPLY // Dead zone at 100% feedrate - if ((feedmultiply < 100 && (feedmultiply + int(lcd_encoder)) > 100) || - (feedmultiply > 100 && (feedmultiply + int(lcd_encoder)) < 100)) + if ((feedmultiply < 100 && (feedmultiply + lcd_encoder) > 100) || + (feedmultiply > 100 && (feedmultiply + lcd_encoder) < 100)) { lcd_encoder = 0; feedmultiply = 100; } - if (feedmultiply == 100 && int(lcd_encoder) > ENCODER_FEEDRATE_DEADZONE) + if (feedmultiply == 100 && lcd_encoder > ENCODER_FEEDRATE_DEADZONE) { - feedmultiply += int(lcd_encoder) - ENCODER_FEEDRATE_DEADZONE; + feedmultiply += lcd_encoder - ENCODER_FEEDRATE_DEADZONE; lcd_encoder = 0; } - else if (feedmultiply == 100 && int(lcd_encoder) < -ENCODER_FEEDRATE_DEADZONE) + else if (feedmultiply == 100 && lcd_encoder < -ENCODER_FEEDRATE_DEADZONE) { - feedmultiply += int(lcd_encoder) + ENCODER_FEEDRATE_DEADZONE; + feedmultiply += lcd_encoder + ENCODER_FEEDRATE_DEADZONE; lcd_encoder = 0; } else if (feedmultiply != 100) { - feedmultiply += int(lcd_encoder); + feedmultiply += lcd_encoder; lcd_encoder = 0; } #endif //ULTIPANEL_FEEDMULTIPLY @@ -2395,7 +2395,7 @@ static void _lcd_move(const char *name, uint8_t axis, int min, int max) refresh_cmd_timeout(); if (! planner_queue_full()) { - current_position[axis] += float((int)lcd_encoder); + current_position[axis] += lcd_encoder; if (min_software_endstops && current_position[axis] < min) current_position[axis] = min; if (max_software_endstops && current_position[axis] > max) current_position[axis] = max; lcd_encoder = 0; @@ -2423,7 +2423,7 @@ void lcd_move_e() refresh_cmd_timeout(); if (! planner_queue_full()) { - current_position[E_AXIS] += float((int)lcd_encoder); + current_position[E_AXIS] += lcd_encoder; lcd_encoder = 0; plan_buffer_line_curposXYZE(manual_feedrate[E_AXIS] / 60); lcd_draw_update = 1; @@ -2610,7 +2610,7 @@ static void lcd_babystep_z() if (lcd_encoder != 0) { - _md->babystepMemZ += (int)lcd_encoder; + _md->babystepMemZ += lcd_encoder; if (_md->babystepMemZ < Z_BABYSTEP_MIN) _md->babystepMemZ = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm else if (_md->babystepMemZ > Z_BABYSTEP_MAX) _md->babystepMemZ = Z_BABYSTEP_MAX; //0 @@ -2724,7 +2724,7 @@ void pid_extruder() { lcd_clear(); lcd_puts_at_P(0, 0, _i("Set temperature:"));////MSG_SET_TEMPERATURE c=20 - pid_temp += int(lcd_encoder); + pid_temp += lcd_encoder; if (pid_temp > HEATER_0_MAXTEMP) pid_temp = HEATER_0_MAXTEMP; if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP; lcd_encoder = 0; @@ -2825,7 +2825,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) _delay(50); if (! planner_queue_full()) { // Only move up, whatever direction the user rotates the encoder. - current_position[Z_AXIS] += fabs(lcd_encoder); + current_position[Z_AXIS] += lcd_encoder; lcd_encoder = 0; plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60); } From 4ca7f8ce2de170795bf331157bd6a267dbf87e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 22 Feb 2023 18:30:51 +0000 Subject: [PATCH 118/240] cleanup: drop lcd_encoder in _menu_edit_P Taken from PR 3985 by adding currentValue infrastructure Change in memory: Flash: 0 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 8 ++++---- Firmware/menu.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index d20c7b055..34e669f16 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -470,14 +470,14 @@ static void _menu_edit_P(void) menu_data_edit_t* _md = (menu_data_edit_t*)&(menu_data[0]); if (lcd_draw_update) { - if (lcd_encoder < _md->minEditValue) lcd_encoder = _md->minEditValue; - else if (lcd_encoder > _md->maxEditValue) lcd_encoder = _md->maxEditValue; + // Constrain the value in case it's outside the allowed limits + _md->currentValue = constrain(_md->currentValue, _md->minEditValue, _md->maxEditValue); lcd_set_cursor(0, 1); - menu_draw_P(' ', _md->editLabel, lcd_encoder); + menu_draw_P(' ', _md->editLabel, _md->currentValue); } if (lcd_clicked()) { - *((T)(_md->editValue)) = lcd_encoder; + *((T)(_md->editValue)) = _md->currentValue; menu_back_no_reset(); } } diff --git a/Firmware/menu.h b/Firmware/menu.h index 7b67bbdf4..291b3845e 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -21,6 +21,7 @@ typedef struct //Variables used when editing values. const char* editLabel; void* editValue; + int16_t currentValue; int16_t minEditValue; int16_t maxEditValue; } menu_data_edit_t; From 6d2a66c1e8c4ef4088d7562a122a29b253388d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 22 Feb 2023 18:45:21 +0000 Subject: [PATCH 119/240] match menu_goto's encoder type to lcd_encoder type Change in memory: Flash: -20 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 2 +- Firmware/menu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 34e669f16..a5a6f6204 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -45,7 +45,7 @@ void menu_data_reset(void) memset(&menu_data, 0, sizeof(menu_data)); } -void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback) +void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state) { CRITICAL_SECTION_START; if (menu_menu != menu) diff --git a/Firmware/menu.h b/Firmware/menu.h index 291b3845e..5a0528c1c 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -65,7 +65,7 @@ extern menu_func_t menu_menu; extern void menu_data_reset(void); -extern void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback=false); +extern void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state); #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0; void menu_start(void); From c16db4e607a459def63404589596667714eb1bde Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 5 Apr 2023 09:54:48 +0200 Subject: [PATCH 120/240] Remove lcd_encoder clamp check as proposed by @leptun --- Firmware/menu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index a5a6f6204..81b4b10ff 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -64,7 +64,6 @@ void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, boo void menu_start(void) { - if (lcd_encoder > INT8_MAX) lcd_encoder = 0; if (lcd_encoder < 0) { lcd_encoder = 0; From dfe6ea647021a861a6716aeb909fe7a61190a483 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 5 Apr 2023 17:45:36 +0200 Subject: [PATCH 121/240] Fixup after rebase --- Firmware/lcd.cpp | 3 +-- Firmware/menu.cpp | 2 +- Firmware/menu.h | 2 +- Firmware/ultralcd.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index c14ab7934..bec189d1b 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -633,8 +633,7 @@ void lcd_printNumber(unsigned long n, uint8_t base) uint8_t lcd_draw_update = 2; int16_t lcd_encoder = 0; -uint8_t lcd_encoder_bits = 0; -int8_t lcd_encoder_diff = 0; +static int8_t lcd_encoder_diff = 0; uint8_t lcd_buttons = 0; uint8_t lcd_update_enabled = 1; diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 81b4b10ff..120471e96 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -45,7 +45,7 @@ void menu_data_reset(void) memset(&menu_data, 0, sizeof(menu_data)); } -void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state) +void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback) { CRITICAL_SECTION_START; if (menu_menu != menu) diff --git a/Firmware/menu.h b/Firmware/menu.h index 5a0528c1c..c3cf80924 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -65,7 +65,7 @@ extern menu_func_t menu_menu; extern void menu_data_reset(void); -extern void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state); +extern void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback=false); #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0; void menu_start(void); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8fb49f464..43dc3aa8a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2825,7 +2825,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) _delay(50); if (! planner_queue_full()) { // Only move up, whatever direction the user rotates the encoder. - current_position[Z_AXIS] += lcd_encoder; + current_position[Z_AXIS] += abs(lcd_encoder); lcd_encoder = 0; plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60); } From 373fab883d0effe3d6b9394f76f53815c07b3b5a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 29 Mar 2023 09:41:14 +0200 Subject: [PATCH 122/240] Fix fsensor runout conditions And also reorder autoload and runout conditions --- Firmware/Filament_sensor.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index f4ec2184f..2c91822d5 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -109,9 +109,9 @@ bool Filament_sensor::checkFilamentEvents() { void Filament_sensor::triggerFilamentInserted() { if (autoLoadEnabled && (eFilamentAction == FilamentAction::None) - && (! MMU2::mmu2.Enabled() ) // quick and dirty hack to prevent spurious runouts while the MMU is in charge && !( - moves_planned() != 0 + MMU2::mmu2.Enabled() // quick and dirty hack to prevent spurious runouts while the MMU is in charge + || moves_planned() != 0 || printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) @@ -124,12 +124,14 @@ void Filament_sensor::triggerFilamentInserted() { void Filament_sensor::triggerFilamentRemoved() { // SERIAL_ECHOLNPGM("triggerFilamentRemoved"); if (runoutEnabled - && (! MMU2::mmu2.Enabled() ) // quick and dirty hack to prevent spurious runouts just before the toolchange && (eFilamentAction == FilamentAction::None) - && !saved_printing && ( moves_planned() != 0 || printJobOngoing() + ) + && !( + saved_printing + || MMU2::mmu2.Enabled() // quick and dirty hack to prevent spurious runouts just before the toolchange || (lcd_commands_type == LcdCommands::Layer1Cal) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) ) From 10ba758bf7003e4daeb7f020fa847f9834c25a58 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 6 Apr 2023 21:35:27 +0200 Subject: [PATCH 123/240] Fix menu encoder rotation --- Firmware/mmu2_reporting.cpp | 8 ++++---- Firmware/ultralcd.cpp | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 4a6be0991..114523a08 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -126,18 +126,18 @@ static uint8_t ReportErrorHookMonitor(uint8_t ei) { // Check if knob was rotated if (lcd_encoder) { if (two_choices == false) { // third_choice is not nullptr, safe to dereference - if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder < 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection--; - } else if (lcd_encoder < 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { + } else if (lcd_encoder > 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { // Rotating knob clockwise current_selection++; } } else { - if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder < 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection = LCD_LEFT_BUTTON_CHOICE; - } else if (lcd_encoder < 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { + } else if (lcd_encoder > 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { // Rotating knob clockwise current_selection = LCD_MIDDLE_BUTTON_CHOICE; } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 43dc3aa8a..752cd1242 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2219,10 +2219,10 @@ uint8_t lcd_alright() { if (lcd_encoder) { - if (lcd_encoder > 0 ) { + if (lcd_encoder < 0 ) { // Rotating knob counter clockwise cursor_pos--; - } else if (lcd_encoder < 0) { + } else if (lcd_encoder > 0) { // Rotating knob clockwise cursor_pos++; } @@ -3095,18 +3095,18 @@ uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P( if (lcd_encoder) { if (msg_next == NULL) { if (third_choice) { // third_choice is not nullptr, safe to dereference - if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder < 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection--; - } else if (lcd_encoder < 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { + } else if (lcd_encoder > 0 && current_selection != LCD_RIGHT_BUTTON_CHOICE) { // Rotating knob clockwise current_selection++; } } else { - if (lcd_encoder > 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { + if (lcd_encoder < 0 && current_selection != LCD_LEFT_BUTTON_CHOICE) { // Rotating knob counter clockwise current_selection = LCD_LEFT_BUTTON_CHOICE; - } else if (lcd_encoder < 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { + } else if (lcd_encoder > 0 && current_selection != LCD_MIDDLE_BUTTON_CHOICE) { // Rotating knob clockwise current_selection = LCD_MIDDLE_BUTTON_CHOICE; } @@ -4717,12 +4717,12 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (lcd_encoder) { - if (lcd_encoder > 0) + if (lcd_encoder < 0) { cursor_pos--; } - if (lcd_encoder < 0) + if (lcd_encoder > 0) { cursor_pos++; } @@ -4808,11 +4808,11 @@ char reset_menu() { delay_keep_alive(0); if (lcd_encoder) { - if (lcd_encoder > 0) { + if (lcd_encoder < 0) { cursor_pos--; } - if (lcd_encoder < 0) { + if (lcd_encoder > 0) { cursor_pos++; } @@ -6915,7 +6915,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, do { if (lcd_encoder) { - if (lcd_encoder > 0) { + if (lcd_encoder < 0) { _result = !check_opposite; lcd_putc_at(0, 2, '>'); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); @@ -6923,7 +6923,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } - if (lcd_encoder < 0) { + if (lcd_encoder > 0) { _result = check_opposite; lcd_putc_at(0, 2, ' '); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); From 49096f14c3905bf9507bd75505a2c3cb03a63ab6 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 7 Apr 2023 09:11:49 +0200 Subject: [PATCH 124/240] SD menu do not consume click in _scrolling state --- Firmware/ultralcd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 752cd1242..1585b2298 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5872,7 +5872,8 @@ void lcd_sdcard_menu() } break; case _scrolling: //scrolling filename { - const bool rewindFlag = lcd_clicked() || lcd_draw_update; //flag that says whether the menu should return to _standard state. + // LCD_CLICKED is used so that the click event is later consumed by the _standard state. + const bool rewindFlag = LCD_CLICKED || lcd_draw_update; //flag that says whether the menu should return to _standard state. if (_md->scrollPointer == NULL) { From 2a3e4cac75c3f3ec076f274385c1e7340c3f72b2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 7 Apr 2023 09:35:31 +0200 Subject: [PATCH 125/240] Fix toggle menu items rendering --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 120471e96..db7d9c293 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -165,7 +165,7 @@ static void menu_draw_toggle_puts_P(const char* str, const char* toggle, const u const char eol = (toggle == NULL) ? LCD_STR_ARROW_RIGHT[0] : ' '; if (toggle == NULL) toggle = _T(MSG_NA); uint8_t len = 4 + (is_progmem ? strlen_P(toggle) : strlen(toggle)); - lcd_putc((settings & 0x01) ? '>' : ' '); + lcd_putc_at(0, menu_row, (settings & 0x01) ? '>' : ' '); lcd_print_pad_P(str, LCD_WIDTH - len); lcd_putc('['); if (is_progmem) From 449e83c7ff31f10a13233852804ad3e899770250 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 7 Apr 2023 10:36:44 +0200 Subject: [PATCH 126/240] Fix filament autoloading --- Firmware/Filament_sensor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index 2c91822d5..ca89fa54f 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -117,7 +117,7 @@ void Filament_sensor::triggerFilamentInserted() { || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) ) ) { - lcd_AutoLoadFilament(); + menu_submenu(lcd_AutoLoadFilament, true); } } From 902780a9292a3f8c3d0ed7a2dbcbc13b477e655f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 20:44:46 +0000 Subject: [PATCH 127/240] Disable M351 when using TMC2130 and code related to it Change in memory (MK3S+ multilang build) Flash: -250 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 ++ Firmware/stepper.cpp | 12 ++++-------- Firmware/stepper.h | 3 +++ Firmware/ultralcd.cpp | 4 +++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6a3565123..ddd5f98c0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8378,6 +8378,7 @@ Sigma_Exit: } break; +#ifndef TMC2130 /*! ### M351 - Toggle Microstep Pins M351: Toggle MS1 MS2 pins directly Toggle MS1 MS2 pins directly. @@ -8411,6 +8412,7 @@ Sigma_Exit: #endif } break; +#endif // !TMC2130 /*! ### M701 - Load filament to extruder M701: Load filament diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index cf51c88ff..758e0dcdb 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1073,10 +1073,10 @@ void st_init() { #ifdef TMC2130 tmc2130_init(TMCInitParams(false, FarmOrUserECool())); -#endif //TMC2130 - +#else st_current_init(); //Initialize Digipot Motor Current microstep_init(); //Initialize Microstepping Pins +#endif //TMC2130 //Initialize Dir Pins #if defined(X_DIR_PIN) && X_DIR_PIN > -1 @@ -1513,6 +1513,7 @@ void digitalPotWrite(int address, int value) // From Arduino DigitalPotControl e } #endif +#ifndef TMC2130 void st_current_init() //Initialize Digipot Motor Current { #ifdef MOTOR_CURRENT_PWM_XY_PIN @@ -1542,8 +1543,6 @@ void st_current_init() //Initialize Digipot Motor Current #endif } - - #ifdef MOTOR_CURRENT_PWM_XY_PIN void st_current_set(uint8_t driver, int current) { @@ -1577,9 +1576,6 @@ void microstep_init() #endif } - -#ifndef TMC2130 - void microstep_ms(uint8_t driver, int8_t ms1, int8_t ms2) { if(ms1 > -1) switch(driver) @@ -1637,4 +1633,4 @@ void microstep_readings() SERIAL_PROTOCOLLN( READ(E1_MS2_PIN)); #endif } -#endif //TMC2130 +#endif //!TMC2130 diff --git a/Firmware/stepper.h b/Firmware/stepper.h index 0fa2811cb..944403fe4 100644 --- a/Firmware/stepper.h +++ b/Firmware/stepper.h @@ -76,12 +76,15 @@ void quickStop(); #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1 void digitalPotWrite(int address, int value); #endif //defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1 + +#ifndef TMC2130 void microstep_ms(uint8_t driver, int8_t ms1, int8_t ms2); void microstep_mode(uint8_t driver, uint8_t stepping); void st_current_init(); void st_current_set(uint8_t driver, int current); void microstep_init(); void microstep_readings(); +#endif //!TMC2130 #ifdef BABYSTEPPING void babystep(const uint8_t axis,const bool direction); // perform a short step with a single stepper motor, outside of any convention diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1585b2298..93489dd97 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3454,8 +3454,10 @@ static void lcd_silent_mode_set() { // Be safe than sorry, reset the stepper timer before re-enabling interrupts. st_reset_timer(); sei(); +#else + st_current_init(); #endif //TMC2130 - st_current_init(); + #ifdef TMC2130 if (lcd_crash_detect_enabled() && (SilentModeMenu != SILENT_MODE_NORMAL)) menu_submenu(lcd_crash_mode_info2); From e70344dc94e295a167b095ce3f112ddce0dbfcdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 9 Apr 2023 12:23:42 +0000 Subject: [PATCH 128/240] Reduce XYZ cal code size Change in memory: Flash: -120 bytes SRAM: 0 bytes --- Firmware/xyzcal.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index cae5f0aed..3794eb4c4 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -415,22 +415,12 @@ void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){ } } -void update_position_1_step(uint8_t axis, uint8_t dir){ - if (axis & X_AXIS_MASK) - _X_ += dir & X_AXIS_MASK ? -1 : 1; - if (axis & Y_AXIS_MASK) - _Y_ += dir & Y_AXIS_MASK ? -1 : 1; - if (axis & Z_AXIS_MASK) - _Z_ += dir & Z_AXIS_MASK ? -1 : 1; +void update_position_1_step(const uint8_t axis, const uint8_t dir) { + count_position[axis] += dir & _BV(axis) ? -1L : 1L; } -void set_axes_dir(uint8_t axes, uint8_t dir){ - if (axes & X_AXIS_MASK) - sm4_set_dir(X_AXIS, dir & X_AXIS_MASK); - if (axes & Y_AXIS_MASK) - sm4_set_dir(Y_AXIS, dir & Y_AXIS_MASK); - if (axes & Z_AXIS_MASK) - sm4_set_dir(Z_AXIS, dir & Z_AXIS_MASK); +void __attribute__((noinline)) set_axes_dir(const uint8_t axis, const uint8_t dir) { + sm4_set_dir(axis, dir & _BV(axis)); } /// Accelerate up to max.speed (defined by @min_delay_us) From 4e31bb94ef48bc87880affc4a1a23aeec1356491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 9 Apr 2023 13:12:22 +0000 Subject: [PATCH 129/240] tmc2130: simplify parsing axis mask There is no need to check if every axis bit with each for-loop iteration. We just need to check if a given axit bit is set. Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 99bc3f5a4..944a7ae3f 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -272,8 +272,7 @@ void tmc2130_home_enter(uint8_t axes_mask) tmc2130_wait_standstill_xy(1000); for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes { - uint8_t mask = (X_AXIS_MASK << axis); - if (axes_mask & mask) + if (const uint8_t mask = axes_mask & _BV(axis); mask) { tmc2130_sg_homing_axes_mask |= mask; //Configuration to spreadCycle @@ -281,8 +280,7 @@ void tmc2130_home_enter(uint8_t axes_mask) tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr_home[axis]) << 16)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis)); tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r_home[axis]); - if (mask & (X_AXIS_MASK | Y_AXIS_MASK | Z_AXIS_MASK)) - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); //stallguard output DIAG1, DIAG1 = pushpull + tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); //stallguard output DIAG1, DIAG1 = pushpull } } #endif //TMC2130_SG_HOMING @@ -298,8 +296,7 @@ void tmc2130_home_exit() { for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes { - uint8_t mask = (X_AXIS_MASK << axis); - if (tmc2130_sg_homing_axes_mask & mask & (X_AXIS_MASK | Y_AXIS_MASK | Z_AXIS_MASK)) + if (tmc2130_sg_homing_axes_mask & _BV(axis)) { #ifndef TMC2130_STEALTH_Z if ((tmc2130_mode == TMC2130_MODE_SILENT) && (axis != Z_AXIS)) From afd4f1d5bc2fbfbcd14e64866da158f405744512 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 15:17:01 +0200 Subject: [PATCH 130/240] Iterate over axis bits --- Firmware/xyzcal.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 3794eb4c4..2ba5d68c2 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -416,11 +416,19 @@ void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){ } void update_position_1_step(const uint8_t axis, const uint8_t dir) { - count_position[axis] += dir & _BV(axis) ? -1L : 1L; + for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i <= Z_AXIS; i++, mask <<= 1) { + if (axis & mask) { + count_position[i] += dir & mask ? -1L : 1L; + } + } } void __attribute__((noinline)) set_axes_dir(const uint8_t axis, const uint8_t dir) { - sm4_set_dir(axis, dir & _BV(axis)); + for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i <= Z_AXIS; i++, mask <<= 1) { + if (axis & mask) { + sm4_set_dir(i, dir & mask); + } + } } /// Accelerate up to max.speed (defined by @min_delay_us) From c4b4cbfc7bba7e79a2fc6a2a4dbdfc104df5b17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 9 Apr 2023 13:40:10 +0000 Subject: [PATCH 131/240] Make the function static --- Firmware/xyzcal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 2ba5d68c2..380065519 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -415,7 +415,7 @@ void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){ } } -void update_position_1_step(const uint8_t axis, const uint8_t dir) { +static void update_position_1_step(const uint8_t axis, const uint8_t dir) { for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i <= Z_AXIS; i++, mask <<= 1) { if (axis & mask) { count_position[i] += dir & mask ? -1L : 1L; @@ -423,7 +423,7 @@ void update_position_1_step(const uint8_t axis, const uint8_t dir) { } } -void __attribute__((noinline)) set_axes_dir(const uint8_t axis, const uint8_t dir) { +static void __attribute__((noinline)) set_axes_dir(const uint8_t axis, const uint8_t dir) { for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i <= Z_AXIS; i++, mask <<= 1) { if (axis & mask) { sm4_set_dir(i, dir & mask); From 339c080b191ea8a5b030d524e7e185dba677f49c Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 17:49:28 +0200 Subject: [PATCH 132/240] tmc2130: optimize mask when iterating over axes Change in memory: Flash: -28 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 944a7ae3f..d4ccf835c 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -268,11 +268,11 @@ void tmc2130_home_enter(uint8_t axes_mask) { printf_P(PSTR("tmc2130_home_enter(axes_mask=0x%02x)\n"), axes_mask); #ifdef TMC2130_SG_HOMING - if (axes_mask & 0x03) //X or Y + if (axes_mask & (X_AXIS_MASK | Y_AXIS_MASK)) //X or Y tmc2130_wait_standstill_xy(1000); - for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes + for (uint8_t axis = X_AXIS, mask = X_AXIS_MASK; axis <= Z_AXIS; axis++, mask <<= 1) //X Y and Z axes { - if (const uint8_t mask = axes_mask & _BV(axis); mask) + if (axes_mask & mask) { tmc2130_sg_homing_axes_mask |= mask; //Configuration to spreadCycle @@ -294,9 +294,9 @@ void tmc2130_home_exit() tmc2130_wait_standstill_xy(1000); if (tmc2130_sg_homing_axes_mask) { - for (uint8_t axis = X_AXIS; axis <= Z_AXIS; axis++) //X Y and Z axes + for (uint8_t axis = X_AXIS, mask = X_AXIS_MASK; axis <= Z_AXIS; axis++, mask <<= 1) //X Y and Z axes { - if (tmc2130_sg_homing_axes_mask & _BV(axis)) + if (tmc2130_sg_homing_axes_mask & mask) { #ifndef TMC2130_STEALTH_Z if ((tmc2130_mode == TMC2130_MODE_SILENT) && (axis != Z_AXIS)) From bfdef3af9fc6cbdf0b08d83a1200582a511dcd47 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 10 Apr 2023 11:42:34 +0200 Subject: [PATCH 133/240] Fix menu items optimizations when extracting to functions. Properly increment menu_item when the menu item is clicked so that you don't get multiple menu items clicked if in view (when the menu code is deduplicated to functions) --- Firmware/menu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index db7d9c293..ee7d147b1 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -140,6 +140,7 @@ void menu_submenu_no_reset(menu_func_t submenu, const bool feedback) uint8_t menu_item_ret(void) { lcd_draw_update = 2; + menu_item++; return 1; } From d3d201730e7b42fe48c717e07dd563fa86aa29c9 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 10 Apr 2023 11:54:51 +0200 Subject: [PATCH 134/240] Do not return early if the menu item is clicked Just let the menu draw till the end even if an item is clicked. The worst this can do is waste some clock cycles flash: -1222B ram: 0B --- Firmware/menu.h | 22 +++++++++++----------- Firmware/ultralcd.cpp | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Firmware/menu.h b/Firmware/menu.h index c3cf80924..a0a6f845f 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -92,36 +92,36 @@ extern uint8_t menu_item_ret(void); #define MENU_ITEM_DUMMY() menu_item_dummy() extern void menu_item_dummy(void); -#define MENU_ITEM_TEXT_P(str) do { if (menu_item_text_P(str)) return; } while (0) +#define MENU_ITEM_TEXT_P(str) do { menu_item_text_P(str); } while (0) extern uint8_t menu_item_text_P(const char* str); -#define MENU_ITEM_SUBMENU_P(str, submenu) do { if (menu_item_submenu_P(str, submenu)) return; } while (0) +#define MENU_ITEM_SUBMENU_P(str, submenu) do { menu_item_submenu_P(str, submenu); } while (0) extern uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu); -#define MENU_ITEM_SUBMENU_E(sheet, submenu) do { if (menu_item_submenu_E(sheet, submenu)) return; } while (0) +#define MENU_ITEM_SUBMENU_E(sheet, submenu) do { menu_item_submenu_E(sheet, submenu); } while (0) extern uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu); -#define MENU_ITEM_FUNCTION_E(sheet, submenu) do { if (menu_item_function_E(sheet, submenu)) return; } while (0) +#define MENU_ITEM_FUNCTION_E(sheet, submenu) do { menu_item_function_E(sheet, submenu); } while (0) extern uint8_t menu_item_function_E(const Sheet &sheet, menu_func_t func); -#define MENU_ITEM_BACK_P(str) do { if (menu_item_back_P(str)) return; } while (0) +#define MENU_ITEM_BACK_P(str) do { menu_item_back_P(str); } while (0) extern uint8_t menu_item_back_P(const char* str); // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P #define ON_MENU_LEAVE(func) do { if (menu_item_leave()){ func } } while (0) extern bool menu_item_leave(); -#define MENU_ITEM_FUNCTION_P(str, func) do { if (menu_item_function_P(str, func)) return; } while (0) +#define MENU_ITEM_FUNCTION_P(str, func) do { menu_item_function_P(str, func); } while (0) extern uint8_t menu_item_function_P(const char* str, menu_func_t func); -#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) +#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { menu_item_function_P(str, number, func, fn_par); } while (0) extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); -#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, 0x02)) return; } while (0) -#define MENU_ITEM_TOGGLE(str, toggle, func) do { if (menu_item_toggle_P(str, toggle, func, 0x00)) return; } while (0) +#define MENU_ITEM_TOGGLE_P(str, toggle, func) do { menu_item_toggle_P(str, toggle, func, 0x02); } while (0) +#define MENU_ITEM_TOGGLE(str, toggle, func) do { menu_item_toggle_P(str, toggle, func, 0x00); } while (0) extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings); -#define MENU_ITEM_GCODE_P(str, str_gcode) do { if (menu_item_gcode_P(str, str_gcode)) return; } while (0) +#define MENU_ITEM_GCODE_P(str, str_gcode) do { menu_item_gcode_P(str, str_gcode); } while (0) extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); @@ -142,7 +142,7 @@ struct SheetFormatBuffer extern void menu_format_sheet_E(const Sheet &sheet_E, SheetFormatBuffer &buffer); -#define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) do { if (menu_item_edit_P(str, pval, minval, maxval)) return; } while (0) +#define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) do { menu_item_edit_P(str, pval, minval, maxval); } while (0) //#define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) MENU_ITEM_EDIT(int3, str, pval, minval, maxval) template extern uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1585b2298..cd86a3388 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -287,8 +287,8 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* lon -#define MENU_ITEM_SDDIR(str_fn, str_fnl) do { if (menu_item_sddir(str_fn, str_fnl)) return; } while (0) -#define MENU_ITEM_SDFILE(str_fn, str_fnl) do { if (menu_item_sdfile(str_fn, str_fnl)) return; } while (0) +#define MENU_ITEM_SDDIR(str_fn, str_fnl) do { menu_item_sddir(str_fn, str_fnl); } while (0) +#define MENU_ITEM_SDFILE(str_fn, str_fnl) do { menu_item_sdfile(str_fn, str_fnl); } while (0) uint8_t menu_item_sddir(const char* str_fn, char* str_fnl) @@ -5470,7 +5470,7 @@ static uint8_t lcd_advance_K() return 0; } -#define MENU_ITEM_EDIT_advance_K() do { if (lcd_advance_K()) return; } while (0) +#define MENU_ITEM_EDIT_advance_K() do { lcd_advance_K(); } while (0) #endif From 9a1eb7b2395a05e182340bad0b6808b02da0fa93 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 10 Apr 2023 12:58:38 +0200 Subject: [PATCH 135/240] Prevent rendering of the remaining menu items if the menu is clicked Also prevent clicking --- Firmware/menu.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index ee7d147b1..c76c0ce23 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -77,6 +77,11 @@ void menu_start(void) void menu_end(void) { + if (menu_row >= LCD_HEIGHT) + { + // Early abort if the menu was clicked. The current menu might have changed because of the click event + return; + } if (lcd_encoder >= menu_item) { lcd_encoder = menu_item - 1; @@ -141,6 +146,11 @@ uint8_t menu_item_ret(void) { lcd_draw_update = 2; menu_item++; + + //prevent the rest of the menu items from rendering or getting clicked + menu_row = LCD_HEIGHT; // early exit from the MENU_BEGIN() for loop at the end of the current cycle + menu_line = 0; // prevent subsequent menu items from rendering at all in the current MENU_BEGIN() for loop cycle + menu_clicked = 0; // prevent subsequent items from being able to be clicked in case the current menu or position was changed by the clicked menu item return 1; } From b735c3d040c46b95f7634d630ff4ea0e411999e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 21:39:22 +0000 Subject: [PATCH 136/240] optimisation: extract common code into SETTINGS_FANS_CHECK Implement it as a function instead of preprocessor macro this allows us to control inlining Change in memory: Flash: -34 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cd86a3388..37eb99bf9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4211,6 +4211,10 @@ static void SETTINGS_SILENT_MODE() { } } +void SETTINGS_FANS_CHECK() { + MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); +} + #ifndef MMU_FORCE_STEALTH_MODE #define SETTINGS_MMU_MODE \ do\ @@ -4557,7 +4561,7 @@ static void lcd_settings_menu() MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), mmu_reset); } - MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + SETTINGS_FANS_CHECK(); SETTINGS_SILENT_MODE(); if(!farm_mode) @@ -5528,7 +5532,7 @@ static void lcd_tune_menu() SETTINGS_CUTTER; } - MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + SETTINGS_FANS_CHECK(); SETTINGS_SILENT_MODE(); SETTINGS_MMU_MODE; SETTINGS_SOUND; From d688f6ec6ff28e3c1bcfd7611a451c33b92bcda2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 10 Apr 2023 15:29:58 +0200 Subject: [PATCH 137/240] Menu item code: optimize return --- Firmware/menu.cpp | 67 ++++++++++++++++++++++--------------------- Firmware/menu.h | 20 ++++++------- Firmware/ultralcd.cpp | 18 ++++++------ 3 files changed, 53 insertions(+), 52 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index c76c0ce23..9e262edec 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -142,7 +142,7 @@ void menu_submenu_no_reset(menu_func_t submenu, const bool feedback) } } -uint8_t menu_item_ret(void) +void menu_item_ret(void) { lcd_draw_update = 2; menu_item++; @@ -151,7 +151,6 @@ uint8_t menu_item_ret(void) menu_row = LCD_HEIGHT; // early exit from the MENU_BEGIN() for loop at the end of the current cycle menu_line = 0; // prevent subsequent menu items from rendering at all in the current MENU_BEGIN() for loop cycle menu_clicked = 0; // prevent subsequent items from being able to be clicked in case the current menu or position was changed by the clicked menu item - return 1; } static char menu_selection_mark(){ @@ -258,13 +257,16 @@ uint8_t menu_item_text_P(const char* str) { if (lcd_draw_update) menu_draw_item_puts_P(' ', str); if (menu_clicked && (lcd_encoder == menu_item)) - return menu_item_ret(); + { + menu_item_ret(); + return 1; + } } menu_item++; return 0; } -uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu) +void menu_item_submenu_P(const char* str, menu_func_t submenu) { if (menu_item == menu_line) { @@ -272,14 +274,14 @@ uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu) if (menu_clicked && (lcd_encoder == menu_item)) { menu_submenu(submenu); - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu) +void menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu) { if (menu_item == menu_line) { @@ -287,14 +289,14 @@ uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu) if (menu_clicked && (lcd_encoder == menu_item)) { menu_submenu(submenu); - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -uint8_t __attribute__((noinline)) menu_item_function_E(const Sheet &sheet, menu_func_t func) +void __attribute__((noinline)) menu_item_function_E(const Sheet &sheet, menu_func_t func) { if (menu_item == menu_line) { @@ -304,14 +306,14 @@ uint8_t __attribute__((noinline)) menu_item_function_E(const Sheet &sheet, menu_ lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -uint8_t menu_item_back_P(const char* str) +void menu_item_back_P(const char* str) { if (menu_item == menu_line) { @@ -319,18 +321,18 @@ uint8_t menu_item_back_P(const char* str) if (menu_clicked && (lcd_encoder == menu_item)) { menu_back(); - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } bool __attribute__((noinline)) menu_item_leave(){ return ((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving; } -uint8_t menu_item_function_P(const char* str, menu_func_t func) +void menu_item_function_P(const char* str, menu_func_t func) { if (menu_item == menu_line) { @@ -340,11 +342,11 @@ uint8_t menu_item_function_P(const char* str, menu_func_t func) lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } //! @brief Menu item function taking single parameter @@ -356,7 +358,7 @@ uint8_t menu_item_function_P(const char* str, menu_func_t func) //! @param fn_par value to be passed to function //! @retval 0 //! @retval 1 Item was clicked -uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par) +void menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par) { if (menu_item == menu_line) { @@ -366,14 +368,14 @@ uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t) lcd_update_enabled = 0; if (func) func(fn_par); lcd_update_enabled = 1; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings) +void menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings) { if (menu_item == menu_line) { @@ -383,22 +385,21 @@ uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func if (toggle == NULL) // print N/A warning message { menu_submenu(func); - return menu_item_ret(); } else // do the actual toggling { lcd_update_enabled = 0; if (func) func(); lcd_update_enabled = 1; - return menu_item_ret(); } + menu_item_ret(); + return; } } menu_item++; - return 0; } -uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) +void menu_item_gcode_P(const char* str, const char* str_gcode) { if (menu_item == menu_line) { @@ -406,11 +407,11 @@ uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) if (menu_clicked && (lcd_encoder == menu_item)) { if (str_gcode) enquecommand_P(str_gcode); - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; @@ -493,7 +494,7 @@ static void _menu_edit_P(void) } template -uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val) +void menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val) { menu_data_edit_t* _md = (menu_data_edit_t*)&(menu_data[0]); if (menu_item == menu_line) @@ -511,15 +512,15 @@ uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_v _md->minEditValue = min_val; _md->maxEditValue = max_val; lcd_encoder = *pval; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -template uint8_t menu_item_edit_P(const char* str, int16_t *pval, int16_t min_val, int16_t max_val); -template uint8_t menu_item_edit_P(const char* str, uint8_t *pval, int16_t min_val, int16_t max_val); +template void menu_item_edit_P(const char* str, int16_t *pval, int16_t min_val, int16_t max_val); +template void menu_item_edit_P(const char* str, uint8_t *pval, int16_t min_val, int16_t max_val); static uint8_t progressbar_block_count = 0; static uint16_t progressbar_total = 0; diff --git a/Firmware/menu.h b/Firmware/menu.h index a0a6f845f..0735bcd5e 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -82,7 +82,7 @@ extern void menu_back_if_clicked(void); extern void menu_submenu(menu_func_t submenu, const bool feedback=false); extern void menu_submenu_no_reset(menu_func_t submenu, const bool feedback=false); -extern uint8_t menu_item_ret(void); +extern void menu_item_ret(void); //extern int menu_draw_item_printf_P(char type_char, const char* format, ...); @@ -96,33 +96,33 @@ extern void menu_item_dummy(void); extern uint8_t menu_item_text_P(const char* str); #define MENU_ITEM_SUBMENU_P(str, submenu) do { menu_item_submenu_P(str, submenu); } while (0) -extern uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu); +extern void menu_item_submenu_P(const char* str, menu_func_t submenu); #define MENU_ITEM_SUBMENU_E(sheet, submenu) do { menu_item_submenu_E(sheet, submenu); } while (0) -extern uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu); +extern void menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu); #define MENU_ITEM_FUNCTION_E(sheet, submenu) do { menu_item_function_E(sheet, submenu); } while (0) -extern uint8_t menu_item_function_E(const Sheet &sheet, menu_func_t func); +extern void menu_item_function_E(const Sheet &sheet, menu_func_t func); #define MENU_ITEM_BACK_P(str) do { menu_item_back_P(str); } while (0) -extern uint8_t menu_item_back_P(const char* str); +extern void menu_item_back_P(const char* str); // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P #define ON_MENU_LEAVE(func) do { if (menu_item_leave()){ func } } while (0) extern bool menu_item_leave(); #define MENU_ITEM_FUNCTION_P(str, func) do { menu_item_function_P(str, func); } while (0) -extern uint8_t menu_item_function_P(const char* str, menu_func_t func); +extern void menu_item_function_P(const char* str, menu_func_t func); #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { menu_item_function_P(str, number, func, fn_par); } while (0) -extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); +extern void menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); #define MENU_ITEM_TOGGLE_P(str, toggle, func) do { menu_item_toggle_P(str, toggle, func, 0x02); } while (0) #define MENU_ITEM_TOGGLE(str, toggle, func) do { menu_item_toggle_P(str, toggle, func, 0x00); } while (0) -extern uint8_t menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings); +extern void menu_item_toggle_P(const char* str, const char* toggle, menu_func_t func, const uint8_t settings); #define MENU_ITEM_GCODE_P(str, str_gcode) do { menu_item_gcode_P(str, str_gcode); } while (0) -extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); +extern void menu_item_gcode_P(const char* str, const char* str_gcode); extern const char menu_fmt_int3[]; @@ -145,7 +145,7 @@ extern void menu_format_sheet_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) #define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) do { menu_item_edit_P(str, pval, minval, maxval); } while (0) //#define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) MENU_ITEM_EDIT(int3, str, pval, minval, maxval) template -extern uint8_t menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val); +extern void menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val); template extern void menu_draw_P(char chr, const char* str, T val); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 37eb99bf9..9b3fa9e4a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -291,7 +291,7 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* lon #define MENU_ITEM_SDFILE(str_fn, str_fnl) do { menu_item_sdfile(str_fn, str_fnl); } while (0) -uint8_t menu_item_sddir(const char* str_fn, char* str_fnl) +static void menu_item_sddir(const char* str_fn, char* str_fnl) { if (menu_item == menu_line) { @@ -304,14 +304,14 @@ uint8_t menu_item_sddir(const char* str_fn, char* str_fnl) lcd_update_enabled = false; menu_action_sddirectory(str_fn); lcd_update_enabled = true; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } -static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl) +static void menu_item_sdfile(const char* str_fn, char* str_fnl) { if (menu_item == menu_line) { @@ -324,11 +324,11 @@ static uint8_t menu_item_sdfile(const char* str_fn, char* str_fnl) lcd_update_enabled = false; menu_action_sdfile(str_fn); lcd_update_enabled = true; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } // Print temperature (nozzle/bed) (9 chars total) @@ -5454,7 +5454,7 @@ static void lcd_advance_edit_K(void) } } -static uint8_t lcd_advance_K() +static void lcd_advance_K() { if (menu_item == menu_line) { @@ -5467,11 +5467,11 @@ static uint8_t lcd_advance_K() { menu_submenu_no_reset(lcd_advance_edit_K); lcd_encoder = 100. * extruder_advance_K; - return menu_item_ret(); + menu_item_ret(); + return; } } menu_item++; - return 0; } #define MENU_ITEM_EDIT_advance_K() do { lcd_advance_K(); } while (0) From 2fc810289a7abee2120b2d55835638b61f93d8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 12 Apr 2023 16:46:33 +0000 Subject: [PATCH 138/240] Fix an issue with feedback double triggering in XYZ cal menu The feedback is produced due to the user clicking the knob the menu_goto call should therefore not trigger additional feedback when switching between menus. No change in memory --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1585b2298..138d170f1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2481,7 +2481,7 @@ static void lcd_menu_xyz_y_min() else lcd_printf_P(_N("%6.2fmm"), distanceMin[i]); } if (lcd_clicked()) - menu_goto(lcd_menu_xyz_skew, 0, true, true); + menu_goto(lcd_menu_xyz_skew, 0, true); } //@brief Show measured axis skewness @@ -2524,7 +2524,7 @@ static void lcd_menu_xyz_skew() lcd_puts_P(_T(MSG_NA)); } if (lcd_clicked()) - menu_goto(lcd_menu_xyz_offset, 0, true, true); + menu_goto(lcd_menu_xyz_offset, 0, true); } //! @brief Show measured bed offset from expected position //! From 53e31932528feb33a86169dce13a40296d51c1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 17:56:27 +0000 Subject: [PATCH 139/240] Fix bug with uint8_t not shown correctly on LCD Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 9e262edec..22b6af9ae 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -439,7 +439,7 @@ void menu_draw_P(char chr, const char* str, T val) } else { // 3 digits lcd_set_cursor_column(LCD_WIDTH - 3); } - lcd_print(val); + lcd_print(val, DEC); } template void menu_draw_P(char chr, const char* str, int16_t val); From b91941f3546ccdb7321b076208b16caedb2c86fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 18:15:50 +0000 Subject: [PATCH 140/240] Fix broken editing menu - currentValue must be initialised when entering the menu - Consume lcd_encoder value when editing an item Change in memory: Flash: +40 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 22b6af9ae..92ccbddd5 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -481,6 +481,9 @@ static void _menu_edit_P(void) menu_data_edit_t* _md = (menu_data_edit_t*)&(menu_data[0]); if (lcd_draw_update) { + _md->currentValue += lcd_encoder; + lcd_encoder = 0; // Consume knob rotation event + // Constrain the value in case it's outside the allowed limits _md->currentValue = constrain(_md->currentValue, _md->minEditValue, _md->maxEditValue); lcd_set_cursor(0, 1); @@ -509,9 +512,9 @@ void menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val) menu_submenu_no_reset(_menu_edit_P); _md->editLabel = str; _md->editValue = pval; + _md->currentValue = *pval; _md->minEditValue = min_val; _md->maxEditValue = max_val; - lcd_encoder = *pval; menu_item_ret(); return; } From 225999b79d068573338e1b46ba872ea46c9b5413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 20:10:12 +0000 Subject: [PATCH 141/240] Remove redundant colon characters The Edit menu already applies a colon to the label string no need to render it twice. Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9b3fa9e4a..2428b11f8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4040,13 +4040,11 @@ void lcd_settings_linearity_correction_menu(void) ); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); #ifdef TMC2130_LINEARITY_CORRECTION_XYZ - //tmc2130_wave_fac[X_AXIS] - - MENU_ITEM_EDIT_int3_P(_i("X-correct:"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_X_CORRECTION c=13 - MENU_ITEM_EDIT_int3_P(_i("Y-correct:"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_Y_CORRECTION c=13 - MENU_ITEM_EDIT_int3_P(_i("Z-correct:"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_Z_CORRECTION c=13 + MENU_ITEM_EDIT_int3_P(_i("X-correct"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_X_CORRECTION c=13 + MENU_ITEM_EDIT_int3_P(_i("Y-correct"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_Y_CORRECTION c=13 + MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_Z_CORRECTION c=13 #endif //TMC2130_LINEARITY_CORRECTION_XYZ - MENU_ITEM_EDIT_int3_P(_i("E-correct:"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=13 + MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=13 MENU_END(); } #endif // TMC2130 From d08302bf0cc594d41b3cb934a777f36eb3a4b1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 20:24:24 +0000 Subject: [PATCH 142/240] Remove colon character from translation --- lang/po/Firmware.pot | 8 ++++---- lang/po/Firmware_cs.po | 16 ++++++++-------- lang/po/Firmware_de.po | 16 ++++++++-------- lang/po/Firmware_es.po | 16 ++++++++-------- lang/po/Firmware_fr.po | 16 ++++++++-------- lang/po/Firmware_hr.po | 16 ++++++++-------- lang/po/Firmware_hu.po | 16 ++++++++-------- lang/po/Firmware_it.po | 16 ++++++++-------- lang/po/Firmware_nl.po | 16 ++++++++-------- lang/po/Firmware_no.po | 16 ++++++++-------- lang/po/Firmware_pl.po | 16 ++++++++-------- lang/po/Firmware_ro.po | 16 ++++++++-------- lang/po/Firmware_sk.po | 16 ++++++++-------- lang/po/Firmware_sv.po | 16 ++++++++-------- 14 files changed, 108 insertions(+), 108 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index f43412179..b76992fbc 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -445,7 +445,7 @@ msgstr "" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" +msgid "E-correct" msgstr "" #. MSG_PROGRESS_ERR_HELP_FIL c=20 @@ -2308,7 +2308,7 @@ msgstr "" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" +msgid "X-correct" msgstr "" #. MSG_XFLASH c=18 @@ -2375,7 +2375,7 @@ msgstr "" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" +msgid "Y-correct" msgstr "" #. MSG_YES c=4 @@ -2392,7 +2392,7 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" +msgid "Z-correct" msgstr "" #. MSG_Z_PROBE_NR c=14 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index ba93df4b1..057eba849 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -468,8 +468,8 @@ msgstr "Konec" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Korekce E:" +msgid "E-correct" +msgstr "Korekce E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2320,8 +2320,8 @@ msgstr "Pruvodce" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Korekce X:" +msgid "X-correct" +msgstr "Korekce X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2391,8 +2391,8 @@ msgstr "Y vzdalenost od min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Korekce Y:" +msgid "Y-correct" +msgstr "Korekce Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2408,8 +2408,8 @@ msgstr "Pruvodce muzete znovu spustit z menu Kalibrace -> Pruvodce." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Korekce Z:" +msgid "Z-correct" +msgstr "Korekce Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index da3a4330f..b876a46f6 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -470,8 +470,8 @@ msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-Korrektur:" +msgid "E-correct" +msgstr "E-Korrektur" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2344,8 +2344,8 @@ msgstr "Assistent" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-Korrektur:" +msgid "X-correct" +msgstr "X-Korrektur" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2417,8 +2417,8 @@ msgstr "Y Entfernung vom Min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-Korrektur:" +msgid "Y-correct" +msgstr "Y-Korrektur" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2436,8 +2436,8 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-Korrektur:" +msgid "Z-correct" +msgstr "Z-Korrektur" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 2ab0eb212..5401d8b6d 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -467,8 +467,8 @@ msgstr "Listo" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Corregir-E:" +msgid "E-correct" +msgstr "Corregir-E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2350,8 +2350,8 @@ msgstr "Asistente" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Corregir-X:" +msgid "X-correct" +msgstr "Corregir-X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2420,8 +2420,8 @@ msgstr "Dist. en Y desde min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Corregir-Y:" +msgid "Y-correct" +msgstr "Corregir-Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2437,8 +2437,8 @@ msgstr "Siempre puedes acceder al asistente desde Calibracion -> Asistente" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Corregir-Z:" +msgid "Z-correct" +msgstr "Corregir-Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 335b2bb29..470a80aad 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -471,8 +471,8 @@ msgstr "Fait" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Correct-E:" +msgid "E-correct" +msgstr "Correct-E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2354,8 +2354,8 @@ msgstr "Assistant" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Correct-X:" +msgid "X-correct" +msgstr "Correct-X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2434,8 +2434,8 @@ msgstr "Distance Y du min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Correct-Y:" +msgid "Y-correct" +msgstr "Correct-Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2452,8 +2452,8 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Correct-Z:" +msgid "Z-correct" +msgstr "Correct-Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 691d243e2..ea0d7c593 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -466,8 +466,8 @@ msgstr "Gotov" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-ispravan:" +msgid "E-correct" +msgstr "E-ispravan" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2342,8 +2342,8 @@ msgstr "Carobnjak" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-ispravan:" +msgid "X-correct" +msgstr "X-ispravan" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2414,8 +2414,8 @@ msgstr "Y distanca od min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-ispravan:" +msgid "Y-correct" +msgstr "Y-ispravan" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2431,8 +2431,8 @@ msgstr "Carobnjak uvijek mozete nastaviti iz Kalibracija -> Carobnjak." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-ispravan:" +msgid "Z-correct" +msgstr "Z-ispravan" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index b8ae2e23d..63e3970e8 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -469,8 +469,8 @@ msgstr "Kesz" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-korrekcio:" +msgid "E-correct" +msgstr "E-korrekcio" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2343,8 +2343,8 @@ msgstr "Varazslo" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-korrekcio:" +msgid "X-correct" +msgstr "X-korrekcio" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2418,8 +2418,8 @@ msgstr "Y-minimum tavolsag" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-korrekcio:" +msgid "Y-correct" +msgstr "Y-korrekcio" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2435,8 +2435,8 @@ msgstr "A Varazsolt barmikor elered a Kalibracio -> Varazslo menubol." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-korrekcio:" +msgid "Z-correct" +msgstr "Z-korrekcio" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index e7d6784ba..ef615e540 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -470,8 +470,8 @@ msgstr "Fatto" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Correzione-E:" +msgid "E-correct" +msgstr "Correzione-E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2346,8 +2346,8 @@ msgstr "Wizard" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Correzione-X:" +msgid "X-correct" +msgstr "Correzione-X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2417,8 +2417,8 @@ msgstr "Distanza Y dal min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Correzione-Y:" +msgid "Y-correct" +msgstr "Correzione-Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2436,8 +2436,8 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Correzione-Z:" +msgid "Z-correct" +msgstr "Correzione-Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 50aebbd28..423118134 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -471,8 +471,8 @@ msgstr "Klaar" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-correctie:" +msgid "E-correct" +msgstr "E-correctie" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2354,8 +2354,8 @@ msgstr "Wizard" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-correctie:" +msgid "X-correct" +msgstr "X-correctie" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2423,8 +2423,8 @@ msgstr "Y afstand van min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-correctie:" +msgid "Y-correct" +msgstr "Y-correctie" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2440,8 +2440,8 @@ msgstr "U kunt de wizard altijd hervatten via Kalibratie -> Wizard." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-correctie:" +msgid "Z-correct" +msgstr "Z-correctie" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 90a5469c3..791faf8df 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -469,8 +469,8 @@ msgstr "Ferdig" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-korreksjon:" +msgid "E-correct" +msgstr "E-korreksjon" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2327,8 +2327,8 @@ msgstr "Veileder" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-korreksjon:" +msgid "X-correct" +msgstr "X-korreksjon" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2396,8 +2396,8 @@ msgstr "Y distanse fra min." #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-korreksjon:" +msgid "Y-correct" +msgstr "Y-korreksjon" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2413,8 +2413,8 @@ msgstr "Du kan alltid starte Veilederen fra Kalibrering -> Veileder." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-korreksjon:" +msgid "Z-correct" +msgstr "Z-korreksjon" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index d155d39ea..318593691 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -470,8 +470,8 @@ msgstr "Wyk." #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Korekcja-E:" +msgid "E-correct" +msgstr "Korekcja-E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2342,8 +2342,8 @@ msgstr "Asystent" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Korekcja-X:" +msgid "X-correct" +msgstr "Korekcja-X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2414,8 +2414,8 @@ msgstr "Dystans od 0 w osi Y" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Korekcja-Y:" +msgid "Y-correct" +msgstr "Korekcja-Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2432,8 +2432,8 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Korekcja-Z:" +msgid "Z-correct" +msgstr "Korekcja-Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index a6b941960..775d92fc0 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -471,8 +471,8 @@ msgstr "Gata" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-correctie:" +msgid "E-correct" +msgstr "E-correctie" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2343,8 +2343,8 @@ msgstr "Wizard" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Corect. X:" +msgid "X-correct" +msgstr "Corect. X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2418,8 +2418,8 @@ msgstr "Distanta Y de la min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Corect. Y:" +msgid "Y-correct" +msgstr "Corect. Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2435,8 +2435,8 @@ msgstr "Puteti oricand sa reluati Wizard-ul din Calibrare -> Wizard." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Corect. Z:" +msgid "Z-correct" +msgstr "Corect. Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 90f1166f4..f95abaf83 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -468,8 +468,8 @@ msgstr "Hotov" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "Korekcia E:" +msgid "E-correct" +msgstr "Korekcia E" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2333,8 +2333,8 @@ msgstr "Sprievodca" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "Korekcia X:" +msgid "X-correct" +msgstr "Korekcia X" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2401,8 +2401,8 @@ msgstr "Y vzdialenost od min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Korekcia Y:" +msgid "Y-correct" +msgstr "Korekcia Y" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2419,8 +2419,8 @@ msgstr "" #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Korekcia Z:" +msgid "Z-correct" +msgstr "Korekcia Z" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index ca0d5668a..f0d8e1d21 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -469,8 +469,8 @@ msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4081 -msgid "E-correct:" -msgstr "E-korrektion:" +msgid "E-correct" +msgstr "E-korrektion" #. MSG_PROGRESS_ERR_HELP_FIL c=20 #: ../../Firmware/mmu2_progress_converter.cpp:19 @@ -2341,8 +2341,8 @@ msgstr "Guide" #. MSG_X_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4077 -msgid "X-correct:" -msgstr "X-korrektion:" +msgid "X-correct" +msgstr "X-korrektion" #. MSG_XFLASH c=18 #: ../../Firmware/ultralcd.cpp:5462 @@ -2409,8 +2409,8 @@ msgstr "Y avstånd från min" #. MSG_Y_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4078 -msgid "Y-correct:" -msgstr "Y-korrekt:" +msgid "Y-correct" +msgstr "Y-korrekt" #. MSG_YES c=4 #: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 @@ -2426,8 +2426,8 @@ msgstr "Du kan alltid återuppta guiden från Kalibrering -> Guide." #. MSG_Z_CORRECTION c=13 #: ../../Firmware/ultralcd.cpp:4079 -msgid "Z-correct:" -msgstr "Z-korrekt:" +msgid "Z-correct" +msgstr "Z-korrekt" #. MSG_Z_PROBE_NR c=14 #: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 From 3cd125c566df0532a9e48663c8cf3514129b30f3 Mon Sep 17 00:00:00 2001 From: Scott Mudge Date: Thu, 6 Apr 2023 09:29:18 -0400 Subject: [PATCH 143/240] MeatPack gcode compression support --- CMakeLists.txt | 2 + Firmware/Configuration.h | 3 + Firmware/cmdqueue.cpp | 17 ++ Firmware/cmdqueue.h | 11 +- Firmware/meatpack.cpp | 379 +++++++++++++++++++++++++++++++++++++++ Firmware/meatpack.h | 70 ++++++++ Firmware/strtod.c | 178 ++++++++++++++++++ 7 files changed, 659 insertions(+), 1 deletion(-) create mode 100644 Firmware/meatpack.cpp create mode 100644 Firmware/meatpack.h create mode 100644 Firmware/strtod.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f4854434..d45f79e85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,6 +142,7 @@ set(FW_SOURCES lcd.cpp Marlin_main.cpp MarlinSerial.cpp + meatpack.cpp menu.cpp mesh_bed_calibration.cpp mesh_bed_leveling.cpp @@ -177,6 +178,7 @@ set(FW_SOURCES spi.c SpoolJoin.cpp stepper.cpp + strtod.c swi2c.c Tcodes.cpp temperature.cpp diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 721ace4ae..f308413cd 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -94,6 +94,9 @@ extern const char _sPrinterMmuName[] PROGMEM; // This determines the communication speed of the printer #define BAUDRATE 115200 +// Enable g-code compression (see https://github.com/scottmudge/OctoPrint-MeatPack) +#define ENABLE_MEATPACK + // This enables the serial port associated to the Bluetooth interface //#define BTENABLED // Enable BT interface on AT90USB devices diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 76962dffc..32f07275e 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -4,6 +4,7 @@ #include "cardreader.h" #include "ultralcd.h" #include "Prusa_farm.h" +#include "meatpack.h" // Reserve BUFSIZE lines of length MAX_CMD_SIZE plus CMDBUFFER_RESERVE_FRONT. char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT]; @@ -365,7 +366,20 @@ void get_command() // start of serial line processing loop while (((MYSERIAL.available() > 0 && !saved_printing) || (MYSERIAL.available() > 0 && isPrintPaused)) && !cmdqueue_serial_disabled) { //is print is saved (crash detection or filament detection), dont process data from serial line +#ifdef ENABLE_MEATPACK + // MeatPack Changes + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + const int rec = MYSERIAL.read(); + if (rec < 0) continue; + + mp_handle_rx_char((uint8_t)rec); + char c_res[2] = {0, 0}; + const uint8_t char_count = mp_get_result_char(c_res); + // Note -- Paired bracket in preproc switch below + for (uint8_t i = 0; i < char_count; ++i) { char serial_char = c_res[i]; +#else char serial_char = MYSERIAL.read(); +#endif serialTimeoutTimer.start(); @@ -526,6 +540,9 @@ void get_command() if(serial_char == ';') comment_mode = true; if(!comment_mode) cmdbuffer[bufindw+CMDHDRSIZE+serial_count++] = serial_char; } + #ifdef ENABLE_MEATPACK + } + #endif } // end of serial line processing loop if (serial_count > 0 && serialTimeoutTimer.expired(farm_mode ? 800 : 2000)) { diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 2d16b8fb1..bf512e09f 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -71,10 +71,19 @@ extern void repeatcommand_front(); extern void get_command(); extern uint16_t cmdqueue_calc_sd_length(); + +#if defined(__cplusplus) +extern "C" { +#endif + extern double strtod_noE(const char* nptr, char** endptr); +#if defined(__cplusplus) +} +#endif + // Return True if a character was found static inline bool code_seen(char code) { return (strchr_pointer = strchr(CMDBUFFER_CURRENT_STRING, code)) != NULL; } static inline bool code_seen_P(const char *code_PROGMEM) { return (strchr_pointer = strstr_P(CMDBUFFER_CURRENT_STRING, code_PROGMEM)) != NULL; } -static inline float code_value() { return strtod(strchr_pointer+1, NULL);} +static inline float code_value() { return strtod_noE(strchr_pointer+1, NULL);} static inline long code_value_long() { return strtol(strchr_pointer+1, NULL, 10); } static inline int16_t code_value_short() { return int16_t(strtol(strchr_pointer+1, NULL, 10)); }; static inline uint8_t code_value_uint8() { return uint8_t(strtol(strchr_pointer+1, NULL, 10)); }; diff --git a/Firmware/meatpack.cpp b/Firmware/meatpack.cpp new file mode 100644 index 000000000..b68a2ca71 --- /dev/null +++ b/Firmware/meatpack.cpp @@ -0,0 +1,379 @@ +/* +* MeatPack G-Code Compression +* +* Algorithm & Implementation: Scott Mudge - mail@scottmudge.com +* Date: Dec. 2020 +*/ + +#include "meatpack.h" + +#ifdef ENABLE_MEATPACK + +#include "language.h" +#include "Marlin.h" + +//#define MP_DEBUG + +// Utility definitions +#define MeatPack_CommandByte 0b11111111 +#define MeatPack_NextPackedFirst 0b00000001 +#define MeatPack_NextPackedSecond 0b00000010 + +#define MeatPack_SpaceCharIdx 11U +#define MeatPack_SpaceCharReplace 'E' + +#define MeatPack_ProtocolVersion "PV01" + +/* + + Character Frequencies from ~30 MB of comment-stripped gcode: + + '1' -> 4451136 + '0' -> 4253577 + ' ' -> 3053297 + '.' -> 3035310 + '2' -> 1523296 + '8' -> 1366812 + '4' -> 1353273 + '9' -> 1352147 + '3' -> 1262929 + '5' -> 1189871 + '6' -> 1127900 + '7' -> 1112908 + '\n' -> 1087683 + 'G' -> 1075806 + 'X' -> 975742 + 'E' -> 965275 + 'Y' -> 965274 + 'F' -> 99416 + '-' -> 90242 + 'Z' -> 34109 + 'M' -> 11879 + 'S' -> 9910 + + If spaces are omitted, we add 'E' + +*/ + +// Note: +// I've tried both a switch/case method and a lookup table. The disassembly is exactly the same after compilation, byte-to-byte. +// Thus, performance is identical. +#define USE_LOOKUP_TABLE + +// State variables +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +enum MeatPack_ConfigStateFlags { + MPConfig_None = 0, + MPConfig_Active = (1 << 0), + MPConfig_NoSpaces = (1 << 1) +}; + +uint8_t mp_config = MPConfig_None; // Configuration state +uint8_t mp_cmd_active = 0; // Is a command is pending +uint8_t mp_char_buf = 0; // Buffers a character if dealing with out-of-sequence pairs +uint8_t mp_cmd_count = 0; // Counts how many command bytes are received (need 2) +uint8_t mp_full_char_queue = 0; // Counts how many full-width characters are to be received +uint8_t mp_char_out_buf[2]; // Output buffer for caching up to 2 characters +uint8_t mp_char_out_count = 0; // Stores number of characters to be read out. + + +#ifdef USE_LOOKUP_TABLE +// The 15 most-common characters used in G-code, ~90-95% of all g-code uses these characters +// NOT storing this with PROGMEM, given how frequently this table will be accessed. +uint8_t MeatPackLookupTbl[16] = { + '0', // 0000 + '1', // 0001 + '2', // 0010 + '3', // 0011 + '4', // 0100 + '5', // 0101 + '6', // 0110 + '7', // 0111 + '8', // 1000 + '9', // 1001 + '.', // 1010 + ' ', // 1011 + '\n', // 1100 + 'G', // 1101 + 'X', // 1110 + '\0' // never used, 0b1111 is used to indicate next 8-bits is a full character +}; +#else +inline uint8_t get_char(const uint8_t in) { + switch (in) { + case 0b0000: + return '0'; + break; + case 0b0001: + return '1'; + break; + case 0b0010: + return '2'; + break; + case 0b0011: + return '3'; + break; + case 0b0100: + return '4'; + break; + case 0b0101: + return '5'; + break; + case 0b0110: + return '6'; + break; + case 0b0111: + return '7'; + break; + case 0b1000: + return '8'; + break; + case 0b1001: + return '9'; + break; + case 0b1010: + return '.'; + break; + case 0b1011: + return (mp_config & MPConfig_NoSpaces) ? MeatPack_SpaceCharReplace : ' '; + break; + case 0b1100: + return '\n'; + break; + case 0b1101: + return 'G'; + break; + case 0b1110: + return 'X'; + break; + } + return 0; +} +#endif + +// #DEBUGGING +#ifdef MP_DEBUG +uint32_t mp_chars_decoded = 0; +#endif + +void FORCE_INLINE mp_handle_output_char(const uint8_t c) { + mp_char_out_buf[mp_char_out_count++] = c; + +#ifdef MP_DEBUG + if (mp_chars_decoded < 4096) { + ++mp_chars_decoded; + SERIAL_ECHOPGM("RB: "); + MYSERIAL.print((char)c); + SERIAL_ECHOLNPGM(""); + } +#endif +} + +// Storing +// packed = ((low & 0xF) << 4) | (high & 0xF); + +// Unpacking +// low = (packed >> 4) & 0xF; +// high = (packed & 0xF); + +//========================================================================== +uint8_t FORCE_INLINE mp_unpack_chars(const uint8_t pk, uint8_t* __restrict const chars_out) { + uint8_t out = 0; + +#ifdef USE_LOOKUP_TABLE + // If lower 4 bytes is 0b1111, the higher 4 are unused, and next char is full. + if ((pk & MeatPack_FirstNotPacked) == MeatPack_FirstNotPacked) out |= MeatPack_NextPackedFirst; + else chars_out[0] = MeatPackLookupTbl[(pk & 0xF)]; // Assign lower char + + // Check if upper 4 bytes is 0b1111... if so, we don't need the second char. + if ((pk & MeatPack_SecondNotPacked) == MeatPack_SecondNotPacked) out |= MeatPack_NextPackedSecond; + else chars_out[1] = MeatPackLookupTbl[((pk >> 4) & 0xf)]; // Assign upper char +#else + // If lower 4 bytes is 0b1111, the higher 4 are unused, and next char is full. + if ((pk & MeatPack_FirstNotPacked) == MeatPack_FirstNotPacked) out |= MeatPack_NextPackedFirst; + else chars_out[0] = get_char(pk & 0xF); // Assign lower char + + // Check if upper 4 bytes is 0b1111... if so, we don't need the second char. + if ((pk & MeatPack_SecondNotPacked) == MeatPack_SecondNotPacked) out |= MeatPack_NextPackedSecond; + else chars_out[1] = get_char((pk >> 4) & 0xf); // Assign upper char +#endif + + return out; +} + +//============================================================================== +void FORCE_INLINE mp_reset_state() { + mp_char_out_count = 0; + mp_cmd_active = MPCommand_None; + mp_config = MPConfig_None; + mp_char_buf = 0; + mp_cmd_count = 0; + mp_cmd_active = 0; + mp_full_char_queue = 0; + +#ifdef MP_DEBUG + mp_chars_decoded = 0; + SERIAL_ECHOLNPGM("MP Reset"); +#endif +} + +//========================================================================== +void FORCE_INLINE mp_handle_rx_char_inner(const uint8_t c) { + + // Packing enabled, handle character and re-arrange them appropriately. + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (mp_config & MPConfig_Active) { + if (mp_full_char_queue > 0) { + mp_handle_output_char(c); + if (mp_char_buf > 0) { + mp_handle_output_char(mp_char_buf); + mp_char_buf = 0; + } + --mp_full_char_queue; + } + else { + uint8_t buf[2] = { 0,0 }; + const uint8_t res = mp_unpack_chars(c, buf); + + if (res & MeatPack_NextPackedFirst) { + ++mp_full_char_queue; + if (res & MeatPack_NextPackedSecond) ++mp_full_char_queue; + else mp_char_buf = buf[1]; + } + else { + mp_handle_output_char(buf[0]); + if (buf[0] != '\n') { + if (res & MeatPack_NextPackedSecond) ++mp_full_char_queue; + else mp_handle_output_char(buf[1]); + } + } + } + } + else // Packing not enabled, just copy character to output + mp_handle_output_char(c); +} + +//========================================================================== +void FORCE_INLINE mp_echo_config_state() { + SERIAL_ECHOPGM(" [MP] "); // Add space at idx 0 just in case first character is dropped due to timing/sync issues. + + // NOTE: if any configuration vars are added below, the outgoing sync text for host plugin + // should not contain the "PV' substring, as this is used to indicate protocol version + SERIAL_ECHOPGM(MeatPack_ProtocolVersion); + + // Echo current state + if (mp_config & MPConfig_Active) + SERIAL_ECHOPGM(" ON"); + else + SERIAL_ECHOPGM(" OFF"); + + if (mp_config & MPConfig_NoSpaces) + SERIAL_ECHOPGM(" NSP"); // [N]o [SP]aces + else + SERIAL_ECHOPGM(" ESP"); // [E]nabled [SP]aces + + SERIAL_ECHOLNPGM(""); + + // Validate config vars +#ifdef USE_LOOKUP_TABLE + if (mp_config & MPConfig_NoSpaces) + MeatPackLookupTbl[MeatPack_SpaceCharIdx] = (uint8_t)(MeatPack_SpaceCharReplace); + else + MeatPackLookupTbl[MeatPack_SpaceCharIdx] = ' '; +#endif + +} + +//========================================================================== +void FORCE_INLINE mp_handle_cmd(const MeatPack_Command c) { + switch (c) { + case MPCommand_EnablePacking: { + mp_config |= MPConfig_Active; +#ifdef MP_DEBUG + SERIAL_ECHOLNPGM("[MPDBG] ENABL REC"); +#endif + } break; + case MPCommand_DisablePacking: { + mp_config &= ~(MPConfig_Active); +#ifdef MP_DEBUG + SERIAL_ECHOLNPGM("[MPDBG] DISBL REC"); +#endif + } break; + case MPCommand_ResetAll: { + mp_reset_state(); +#ifdef MP_DEBUG + SERIAL_ECHOLNPGM("[MPDBG] RESET REC"); +#endif + } break; + case MPCommand_EnableNoSpaces: { + mp_config |= MPConfig_NoSpaces; +#ifdef MP_DEBUG + SERIAL_ECHOLNPGM("[MPDBG] ENABL NSP"); +#endif + } break; + case MPCommand_DisableNoSpaces: { + mp_config &= ~(MPConfig_NoSpaces); +#ifdef MP_DEBUG + SERIAL_ECHOLNPGM("[MPDBG] DISBL NSP"); +#endif + } break; + default: { +#ifdef MP_DEBUG + SERIAL_ECHOLN("[MPDBG] UNK CMD REC"); +#endif + } + case MPCommand_QueryConfig: + break; + } + + mp_echo_config_state(); +} + +//========================================================================== +void mp_handle_rx_char(const uint8_t c) { + + // Check for commit complete + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (c == (uint8_t)(MeatPack_CommandByte)) { + if (mp_cmd_count > 0) { + mp_cmd_active = 1; + mp_cmd_count = 0; + } + else + ++mp_cmd_count; + return; + } + + if (mp_cmd_active > 0) { + mp_handle_cmd((MeatPack_Command)c); + mp_cmd_active = 0; + return; + } + + if (mp_cmd_count > 0) { + mp_handle_rx_char_inner((uint8_t)(MeatPack_CommandByte)); + mp_cmd_count = 0; + } + + mp_handle_rx_char_inner(c); +} + +//========================================================================== +uint8_t mp_get_result_char(char* const __restrict out) { + if (mp_char_out_count > 0) { + const uint8_t res = mp_char_out_count; + for (uint8_t i = 0; i < mp_char_out_count; ++i) + out[i] = (char)mp_char_out_buf[i]; + mp_char_out_count = 0; + return res; + } + return 0; +} + +//============================================================================== +void mp_trigger_cmd(const MeatPack_Command cmd) +{ + mp_handle_cmd(cmd); +} + +#endif diff --git a/Firmware/meatpack.h b/Firmware/meatpack.h new file mode 100644 index 000000000..4c949abf2 --- /dev/null +++ b/Firmware/meatpack.h @@ -0,0 +1,70 @@ +/* +* MeatPack G-Code Compression +* +* Algorithm & Implementation: Scott Mudge - mail@scottmudge.com +* Date: Dec. 2020 +* +* Specifically optimized for 3D printing G-Code, this is a zero-cost data compression method +* which packs ~180-190% more data into the same amount of bytes going to the CNC controller. +* As a majority of G-Code can be represented by a restricted alphabet, I performed histogram +* analysis on a wide variety of 3D printing gcode samples, and found ~93% of all gcode could +* be represented by the same 15-character alphabet. +* +* This allowed me to design a system of packing 2 8-bit characters into a single byte, assuming +* they fall within this limited 15-character alphabet. Using a 4-bit lookup table, these 8-bit +* characters can be represented by a 4-bit index. +* +* Combined with some logic to allow commingling of full-width characters outside of this 15- +* character alphabet (at the cost of an extra 8-bits per full-width character), and by stripping +* out unnecessary comments, the end result is gcode which is roughly half the original size. +* +* Why did I do this? I noticed micro-stuttering and other data-bottleneck issues while printing +* objects with high curvature, especially at high speeds. There is also the issue of the limited +* baud rate provided by Prusa's Atmega2560-based boards, over the USB serial connection. So soft- +* ware like OctoPrint would also suffer this same micro-stuttering and poor print quality issue. +* +*/ +#include +#include "Configuration.h" + +#ifndef MEATPACK_H_ +#define MEATPACK_H_ + +#ifdef ENABLE_MEATPACK + +#define MeatPack_SecondNotPacked 0b11110000 +#define MeatPack_FirstNotPacked 0b00001111 + +// These are commands sent to MeatPack to control its behavior. +// They are sent by first sending 2x MeatPack_CommandByte (0xFF) in sequence, +// followed by one of the command bytes below. +// Provided that 0xFF is an exceedingly rare character that is virtually never +// present in g-code naturally, it is safe to assume 2 in sequence should never +// happen naturally, and so it is used as a signal here. +// +// 0xFF *IS* used in "packed" g-code (used to denote that the next 2 characters are +// full-width), however 2 in a row will never occur, as the next 2 bytes will always +// some non-0xFF character. +enum MeatPack_Command { + MPCommand_None = 0U, + // MPCommand_TogglePacking = 253U, -- Unused, byte 253 can be re-used later. + MPCommand_EnablePacking = 251U, + MPCommand_DisablePacking = 250U, + MPCommand_ResetAll = 249U, + MPCommand_QueryConfig = 248U, + MPCommand_EnableNoSpaces = 247U, + MPCommand_DisableNoSpaces = 246U +}; + +// Pass in a character rx'd by SD card or serial. Automatically parses command/ctrl sequences, +// and will control state internally. +extern void mp_handle_rx_char(const uint8_t c); + +// After passing in rx'd char using above method, call this to get characters out. Can return +// from 0 to 2 characters at once. +// @param out [in] Output pointer for unpacked/processed data. +// @return Number of characters returned. Range from 0 to 2. +extern uint8_t mp_get_result_char(char* const __restrict out); +#endif + +#endif // MEATPACK_H_ diff --git a/Firmware/strtod.c b/Firmware/strtod.c new file mode 100644 index 000000000..b039f9dbd --- /dev/null +++ b/Firmware/strtod.c @@ -0,0 +1,178 @@ +// Note -- This is a modified stdtod() method, to prevent the catching of uppercase "E", used in 3D printing g-code. + + +#if !defined(__AVR_TINY__) + +#include +#include +#include +#include +#include /* INFINITY, NAN */ +#include + +/* Only GCC 4.2 calls the library function to convert an unsigned long + to float. Other GCC-es (including 4.3) use a signed long to float + conversion along with a large inline code to correct the result. */ +extern double __floatunsisf(unsigned long); + +PROGMEM static const float pwr_p10[6] = { + 1e+1, 1e+2, 1e+4, 1e+8, 1e+16, 1e+32 +}; +PROGMEM static const float pwr_m10[6] = { + 1e-1, 1e-2, 1e-4, 1e-8, 1e-16, 1e-32 +}; + +/* PSTR() is not used to save 1 byte per string: '\0' at the tail. */ +PROGMEM static const char pstr_inf[] = { 'I','N','F' }; +PROGMEM static const char pstr_inity[] = { 'I','N','I','T','Y' }; +PROGMEM static const char pstr_nan[] = { 'N','A','N' }; + + +double strtod_noE(const char* nptr, char** endptr) +{ + union { + unsigned long u32; + float flt; + } x; + unsigned char c; + int exp; + + unsigned char flag; +#define FL_MINUS 0x01 /* number is negative */ +#define FL_ANY 0x02 /* any digit was readed */ +#define FL_OVFL 0x04 /* overflow was */ +#define FL_DOT 0x08 /* decimal '.' was */ +#define FL_MEXP 0x10 /* exponent 'e' is neg. */ + + if (endptr) + *endptr = (char*)nptr; + + do { + c = *nptr++; + } while (isspace(c)); + + flag = 0; + if (c == '-') { + flag = FL_MINUS; + c = *nptr++; + } + else if (c == '+') { + c = *nptr++; + } + + if (!strncasecmp_P(nptr - 1, pstr_inf, 3)) { + nptr += 2; + if (!strncasecmp_P(nptr, pstr_inity, 5)) + nptr += 5; + if (endptr) + *endptr = (char*)nptr; + return flag & FL_MINUS ? -INFINITY : +INFINITY; + } + + /* NAN() construction is not realised. + Length would be 3 characters only. */ + if (!strncasecmp_P(nptr - 1, pstr_nan, 3)) { + if (endptr) + *endptr = (char*)nptr + 2; + return NAN; + } + + x.u32 = 0; + exp = 0; + while (1) { + + c -= '0'; + + if (c <= 9) { + flag |= FL_ANY; + if (flag & FL_OVFL) { + if (!(flag & FL_DOT)) + exp += 1; + } + else { + if (flag & FL_DOT) + exp -= 1; + /* x.u32 = x.u32 * 10 + c */ + x.u32 = (((x.u32 << 2) + x.u32) << 1) + c; + if (x.u32 >= (ULONG_MAX - 9) / 10) + flag |= FL_OVFL; + } + + } + else if (c == (('.' - '0') & 0xff) && !(flag & FL_DOT)) { + flag |= FL_DOT; + } + else { + break; + } + c = *nptr++; + } + + // Check for exponent "E", but disable capital E + if (c == (('e' - '0') & 0xff) /*|| c == (('E' - '0') & 0xff)*/) + { + int i; + c = *nptr++; + i = 2; + if (c == '-') { + flag |= FL_MEXP; + c = *nptr++; + } + else if (c == '+') { + c = *nptr++; + } + else { + i = 1; + } + c -= '0'; + if (c > 9) { + nptr -= i; + } + else { + i = 0; + do { + if (i < 3200) + i = (((i << 2) + i) << 1) + c; /* i = 10*i + c */ + c = *nptr++ - '0'; + } while (c <= 9); + if (flag & FL_MEXP) + i = -i; + exp += i; + } + } + + if ((flag & FL_ANY) && endptr) + *endptr = (char*)nptr - 1; + + x.flt = __floatunsisf(x.u32); /* manually */ + if ((flag & FL_MINUS) && (flag & FL_ANY)) + x.flt = -x.flt; + + if (x.flt != 0) { + int pwr; + if (exp < 0) { + nptr = (void*)(pwr_m10 + 5); + exp = -exp; + } + else { + nptr = (void*)(pwr_p10 + 5); + } + for (pwr = 32; pwr; pwr >>= 1) { + for (; exp >= pwr; exp -= pwr) { + union { + unsigned long u32; + float flt; + } y; + y.u32 = pgm_read_dword((float*)nptr); + x.flt *= y.flt; + } + nptr -= sizeof(float); + } + if (!isfinite(x.flt) || x.flt == 0) + errno = ERANGE; + } + + return x.flt; +} + +#endif From f388d8abb671ba18713f60c4bc93b7ff20682266 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 30 Mar 2023 13:50:32 +0200 Subject: [PATCH 144/240] postponed kill() message with softReset --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 81 +++++++++++++++++++--------------------- Firmware/cardreader.cpp | 4 +- Firmware/cmdqueue.cpp | 2 +- Firmware/eeprom.h | 2 + Firmware/temperature.cpp | 2 +- 6 files changed, 45 insertions(+), 48 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index ddb758a12..28ebf9f11 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -234,7 +234,7 @@ void FlushSerialRequestResend(); void ClearToSend(); void update_currents(); -void kill(const char *full_screen_message = NULL, unsigned char id = 0); +void kill(const char *full_screen_message = NULL); void finishAndDisableSteppers(); void UnconditionalStop(); // Stop heaters, motion and clear current print status diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 155c6fd2b..e66ee6235 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1037,6 +1037,17 @@ static void fw_crash_init() eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, 0xFF); } +static void fw_kill_init() { + PGM_P kill_msg = (PGM_P)eeprom_init_default_word((uint16_t*)EEPROM_KILL_MESSAGE, 0); + if (kill_msg) { + // clear pending message event + eeprom_write_word((uint16_t*)EEPROM_KILL_MESSAGE, 0); + + // display the kill message + lcd_show_fullscreen_message_and_wait_P(kill_msg); + } +} + static void xflash_err_msg() { @@ -1577,6 +1588,9 @@ void setup() // report crash failures fw_crash_init(); + // report kill() events + fw_kill_init(); + #ifdef UVLO_SUPPORT if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO /* @@ -5970,7 +5984,7 @@ Sigma_Exit: It is processed much earlier as to bypass the cmdqueue. */ case 112: - kill(MSG_M112_KILL, 3); + kill(MSG_M112_KILL); break; /*! @@ -9378,7 +9392,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s if(previous_millis_cmd.expired(max_inactive_time)) if(max_inactive_time) - kill(_n("Inactivity Shutdown"), 4); + kill(PSTR("Inactivity Shutdown")); if(stepper_inactive_time) { if(previous_millis_cmd.expired(stepper_inactive_time)) { @@ -9419,7 +9433,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s // ---------------------------------------------------------------- if ( killCount >= KILL_DELAY) { - kill(NULL, 5); + kill(); } #endif @@ -9465,49 +9479,30 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s host_keepalive(); } -void kill(const char *full_screen_message, unsigned char id) -{ - printf_P(_N("KILL: %d\n"), id); - //return; - cli(); // Stop interrupts - disable_heater(); +void kill(const char *full_screen_message) { + cli(); // Stop interrupts + disable_heater(); - disable_x(); -// SERIAL_ECHOLNPGM("kill - disable Y"); - disable_y(); - poweroff_z(); - disable_e0(); - disable_e1(); - disable_e2(); + disable_x(); + disable_y(); + poweroff_z(); + disable_e0(); + disable_e1(); + disable_e2(); -#if defined(PS_ON_PIN) && PS_ON_PIN > -1 - pinMode(PS_ON_PIN,INPUT); -#endif - SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_n("Printer halted. kill() called!"));////MSG_ERR_KILLED - if (full_screen_message != NULL) { - SERIAL_ERRORLNRPGM(full_screen_message); - lcd_display_message_fullscreen_P(full_screen_message); - } else { - LCD_ALERTMESSAGERPGM(_n("KILLED. "));////MSG_KILLED - } + SERIAL_ERROR_START; + SERIAL_ERRORLNRPGM(PSTR("Printer halted. kill() called!")); - // FMC small patch to update the LCD before ending - sei(); // enable interrupts - for ( int i=5; i--; lcd_update(0)) - { - _delay(200); - } - cli(); // disable interrupts - suicide(); - while(1) - { -#ifdef WATCHDOG - wdt_reset(); -#endif //WATCHDOG - /* Intentionally left empty */ - - } // Wait for reset + if (full_screen_message != NULL) { + SERIAL_ERRORLNRPGM(full_screen_message); + } else { + full_screen_message = PSTR("KILLED."); + } + + // update eeprom with the correct kill message to be shown on startup + eeprom_write_word((uint16_t*)EEPROM_KILL_MESSAGE, (uint16_t)full_screen_message); + + softReset(); } void UnconditionalStop() diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 8b902b703..3f437af1f 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -402,7 +402,7 @@ void CardReader::openFileReadFilteredGcode(const char* name, bool replace_curren // SERIAL_ERROR_START; // SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); // SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); - kill(ofKill, 1); + kill(ofKill); return; } @@ -469,7 +469,7 @@ void CardReader::openFileWrite(const char* name) // SERIAL_ERROR_START; // SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); // SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); - kill(ofKill, 1); + kill(ofKill); return; } diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 76962dffc..6d31ab9c7 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -455,7 +455,7 @@ void get_command() // Handle KILL early, even when Stopped if(strcmp_P(cmd_start, PSTR("M112")) == 0) - kill(MSG_M112_KILL, 2); + kill(MSG_M112_KILL); // Bypass Stopped for some commands bool allow_when_stopped = false; diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index ae9185eb1..e2dc2ec9c 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -596,6 +596,8 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_TEMP_MODEL_L (EEPROM_TEMP_MODEL_D-2) //uint16_t #define EEPROM_TEMP_MODEL_VER (EEPROM_TEMP_MODEL_L-1) //uint8_t +#define EEPROM_KILL_MESSAGE (EEPROM_TEMP_MODEL_VER-2) //PGM_P + //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. #define EEPROM_LAST_ITEM EEPROM_TEMP_MODEL_VER // !!!!! diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index c5ef0d5b7..5dab747bd 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -598,7 +598,7 @@ static float analog2temp(int raw, uint8_t e) { SERIAL_ERROR_START; SERIAL_ERROR((int)e); SERIAL_ERRORLNPGM(" - Invalid extruder number !"); - kill(NULL, 6); + kill(); return 0.0; } #ifdef HEATER_0_USES_MAX6675 From 2aca89d6dc5e0918ab0ab327951a9a699a3a42a6 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 30 Mar 2023 14:01:53 +0200 Subject: [PATCH 145/240] Update eeprom documentation --- Firmware/eeprom.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index e2dc2ec9c..7cfcb89a9 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -361,6 +361,8 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0CA1 3233 | float | EEPROM_TEMP_MODEL_V | ??? | ff ff ff ffh | Temp model linear temperature intercept (W/W) | Temp model | D3 Ax0ca1 C4 | 0x0C9D 3229 | float | EEPROM_TEMP_MODEL_D | ??? | ff ff ff ffh | Temp model sim. 1st order IIR filter factor | Temp model | D3 Ax0c9d C4 | 0x0C99 3225 | uint16 | EEPROM_TEMP_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c99 C2 +| 0x0C98 3224 | uint8 | EEPROM_TEMP_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c98 C1 +| 0x0C96 3222 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c96 C2 |Address begin|Bit/Type | Name | Valid values | Default/FactoryReset | Description |Gcode/Function| Debug code | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: @@ -599,7 +601,7 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_KILL_MESSAGE (EEPROM_TEMP_MODEL_VER-2) //PGM_P //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_TEMP_MODEL_VER +#define EEPROM_LAST_ITEM EEPROM_KILL_MESSAGE // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! From 4b65d49512a04dba2affe91383d708d80ed70498 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 18:25:47 +0200 Subject: [PATCH 146/240] Move kill check earlier during startup --- Firmware/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e66ee6235..27d6e0a9b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1355,6 +1355,9 @@ void setup() if (!xflash_success) xflash_err_msg(); + // report kill() events + fw_kill_init(); + #ifdef FILAMENT_SENSOR fsensor.init(); #endif //FILAMENT_SENSOR @@ -1588,9 +1591,6 @@ void setup() // report crash failures fw_crash_init(); - // report kill() events - fw_kill_init(); - #ifdef UVLO_SUPPORT if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO /* From f333d36e47be8643af0872f19396aea9f9dd0735 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 18:44:17 +0200 Subject: [PATCH 147/240] Use a different location as a kill message pending flag The old implementation would fail if the message was in progmem at address 0xffff or 0x0000 (both unlikely). It would also fail if the eeprom was initialized to some other random value, which could have been dangerous when displayed as a full screen message. --- Firmware/Marlin_main.cpp | 9 ++++++--- Firmware/eeprom.h | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 27d6e0a9b..c43e4c740 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1037,11 +1037,13 @@ static void fw_crash_init() eeprom_update_byte((uint8_t*)EEPROM_FW_CRASH_FLAG, 0xFF); } +#define KILL_PENDING_FLAG 0x42 + static void fw_kill_init() { - PGM_P kill_msg = (PGM_P)eeprom_init_default_word((uint16_t*)EEPROM_KILL_MESSAGE, 0); - if (kill_msg) { + if (eeprom_read_byte((uint8_t*)EEPROM_KILL_PENDING_FLAG) == KILL_PENDING_FLAG) { + PGM_P kill_msg = (PGM_P)eeprom_read_word((uint16_t*)EEPROM_KILL_MESSAGE); // clear pending message event - eeprom_write_word((uint16_t*)EEPROM_KILL_MESSAGE, 0); + eeprom_write_byte((uint8_t*)EEPROM_KILL_PENDING_FLAG, EEPROM_EMPTY_VALUE); // display the kill message lcd_show_fullscreen_message_and_wait_P(kill_msg); @@ -9501,6 +9503,7 @@ void kill(const char *full_screen_message) { // update eeprom with the correct kill message to be shown on startup eeprom_write_word((uint16_t*)EEPROM_KILL_MESSAGE, (uint16_t)full_screen_message); + eeprom_write_byte((uint8_t*)EEPROM_KILL_PENDING_FLAG, KILL_PENDING_FLAG); softReset(); } diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 7cfcb89a9..674854473 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -363,6 +363,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0C99 3225 | uint16 | EEPROM_TEMP_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c99 C2 | 0x0C98 3224 | uint8 | EEPROM_TEMP_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c98 C1 | 0x0C96 3222 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c96 C2 +| 0x0C95 3221 | uint8 | EEPROM_KILL_PENDING_FLAG | 42h, ffh | ffh | Kill pending flag (0x42 magic value) | kill() | D3 Ax0c95 C1 |Address begin|Bit/Type | Name | Valid values | Default/FactoryReset | Description |Gcode/Function| Debug code | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: @@ -599,9 +600,10 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_TEMP_MODEL_VER (EEPROM_TEMP_MODEL_L-1) //uint8_t #define EEPROM_KILL_MESSAGE (EEPROM_TEMP_MODEL_VER-2) //PGM_P +#define EEPROM_KILL_PENDING_FLAG (EEPROM_KILL_MESSAGE-1) //uint8 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_KILL_MESSAGE +#define EEPROM_LAST_ITEM EEPROM_KILL_PENDING_FLAG // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! From af4a3f3328fd2506ccafdf844afcb344d1fab242 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 13 Apr 2023 11:15:17 +0200 Subject: [PATCH 148/240] Reorder eeprom reads Saves 4B of flash --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c43e4c740..a124c9be0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1041,11 +1041,11 @@ static void fw_crash_init() static void fw_kill_init() { if (eeprom_read_byte((uint8_t*)EEPROM_KILL_PENDING_FLAG) == KILL_PENDING_FLAG) { - PGM_P kill_msg = (PGM_P)eeprom_read_word((uint16_t*)EEPROM_KILL_MESSAGE); // clear pending message event eeprom_write_byte((uint8_t*)EEPROM_KILL_PENDING_FLAG, EEPROM_EMPTY_VALUE); // display the kill message + PGM_P kill_msg = (PGM_P)eeprom_read_word((uint16_t*)EEPROM_KILL_MESSAGE); lcd_show_fullscreen_message_and_wait_P(kill_msg); } } From 41b8279805bc3b8dce1b07e8e2a7b5a77c7f0ee6 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 13 Apr 2023 11:34:18 +0200 Subject: [PATCH 149/240] Fix eeprom table addresses --- Firmware/eeprom.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 674854473..e54984d53 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -357,13 +357,13 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 20h 32 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 40h 64 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 80h 128 | ^ | Unknown | ^ | ^ -| 0x0CA5 3237 | float | EEPROM_TEMP_MODEL_U | ??? | ff ff ff ffh | Temp model linear temperature coefficient (W/K/W) | Temp model | D3 Ax0ca5 C4 -| 0x0CA1 3233 | float | EEPROM_TEMP_MODEL_V | ??? | ff ff ff ffh | Temp model linear temperature intercept (W/W) | Temp model | D3 Ax0ca1 C4 -| 0x0C9D 3229 | float | EEPROM_TEMP_MODEL_D | ??? | ff ff ff ffh | Temp model sim. 1st order IIR filter factor | Temp model | D3 Ax0c9d C4 -| 0x0C99 3225 | uint16 | EEPROM_TEMP_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c99 C2 -| 0x0C98 3224 | uint8 | EEPROM_TEMP_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c98 C1 -| 0x0C96 3222 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c96 C2 -| 0x0C95 3221 | uint8 | EEPROM_KILL_PENDING_FLAG | 42h, ffh | ffh | Kill pending flag (0x42 magic value) | kill() | D3 Ax0c95 C1 +| 0x0CA2 3234 | float | EEPROM_TEMP_MODEL_U | ??? | ff ff ff ffh | Temp model linear temperature coefficient (W/K/W) | Temp model | D3 Ax0ca2 C4 +| 0x0C9E 3230 | float | EEPROM_TEMP_MODEL_V | ??? | ff ff ff ffh | Temp model linear temperature intercept (W/W) | Temp model | D3 Ax0c9e C4 +| 0x0C9A 3226 | float | EEPROM_TEMP_MODEL_D | ??? | ff ff ff ffh | Temp model sim. 1st order IIR filter factor | Temp model | D3 Ax0c9a C4 +| 0x0C98 3224 | uint16 | EEPROM_TEMP_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c98 C2 +| 0x0C97 3223 | uint8 | EEPROM_TEMP_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c97 C1 +| 0x0C95 3221 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c95 C2 +| 0x0C94 3220 | uint8 | EEPROM_KILL_PENDING_FLAG | 42h, ffh | ffh | Kill pending flag (0x42 magic value) | kill() | D3 Ax0c94 C1 |Address begin|Bit/Type | Name | Valid values | Default/FactoryReset | Description |Gcode/Function| Debug code | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: From 4b3dc655989a27466f2acd64114c23793728fec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 11:28:07 +0000 Subject: [PATCH 150/240] Don't always set MSG_WELCOME at end of toolchange This should only be set when NOT printing Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/mmu2_reporting.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 114523a08..5504128a8 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -20,7 +20,9 @@ void BeginReport(CommandInProgress /*cip*/, uint16_t ec) { void EndReport(CommandInProgress /*cip*/, uint16_t /*ec*/) { // clear the status msg line - let the printed filename get visible again - lcd_setstatuspgm(MSG_WELCOME); // should be seen only when the printer is not printing a file + if (!printJobOngoing()) { + lcd_setstatuspgm(MSG_WELCOME); + } custom_message_type = CustomMsg::Status; } From f34c1ffeacaf1efcc870cd903ac0be30f27c4d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Apr 2023 11:28:58 +0000 Subject: [PATCH 151/240] Fix an issue where visualisation is overwritten by SD file name We should let EndReport set the custom message type state to Status This will ensure the SD file name is shown correctly AFTER we've shown the visualisation Currently the visualisation is cut off in the middle by ReportProgressHook Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/mmu2_reporting.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 5504128a8..ea4bcd01f 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -272,11 +272,6 @@ void ReportProgressHook(CommandInProgress cip, uint16_t ec) { if (cip != CommandInProgress::NoCommand) { custom_message_type = CustomMsg::MMUProgress; lcd_setstatuspgm( _T(ProgressCodeToText(ec)) ); - } else { - // If there is no command in progress we can display other - // useful information such as the name of the SD file - // being printed - custom_message_type = CustomMsg::Status; } } From 95acdba5fa62952a9b933eec5ff82f9bd7800562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Apr 2023 21:31:12 +0000 Subject: [PATCH 152/240] Fix lcd_update() FW crashes Change in memory: Flash: +10 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 3 +++ Firmware/lcd.cpp | 12 ++++++------ Firmware/lcd.h | 4 ++++ Firmware/ultralcd.cpp | 9 ++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a124c9be0..4c5934a33 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9464,6 +9464,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s check_axes_activity(); MMU2::mmu2.mmu_loop(); + lcd_knob_update(); + backlight_update(); + // handle longpress if(lcd_longpress_trigger) { diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index bec189d1b..0cbd5ac2b 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -690,11 +690,7 @@ void lcd_quick_feedback(void) lcd_beeper_quick_feedback(); } -void lcd_update(uint8_t lcdDrawUpdateOverride) -{ - if (lcd_draw_update < lcdDrawUpdateOverride) - lcd_draw_update = lcdDrawUpdateOverride; - +void lcd_knob_update() { if (lcd_backlight_wake_trigger) { lcd_backlight_wake_trigger = false; backlight_wake(); @@ -711,8 +707,12 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) lcd_draw_update = 1; } } +} - backlight_update(); +void lcd_update(uint8_t lcdDrawUpdateOverride) +{ + if (lcd_draw_update < lcdDrawUpdateOverride) + lcd_draw_update = lcdDrawUpdateOverride; if (!lcd_update_enabled) return; diff --git a/Firmware/lcd.h b/Firmware/lcd.h index eee69e97d..aedfc38d3 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -123,6 +123,10 @@ extern void lcd_beeper_quick_feedback(void); //Cause an LCD refresh, and give the user visual or audible feedback that something has happened extern void lcd_quick_feedback(void); +/// @brief Check whether knob is rotated or clicked and update relevant +///variables. Flags are set by lcd_buttons_update in ISR context. +extern void lcd_knob_update(); + extern void lcd_update(uint8_t lcdDrawUpdateOverride); extern void lcd_update_enable(uint8_t enabled); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a53a25ba1..f634d677c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2213,7 +2213,8 @@ uint8_t lcd_alright() { lcd_consume_click(); while (1) { - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { @@ -4713,7 +4714,8 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite KEEPALIVE_STATE(PAUSED_FOR_USER); while (1) { - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { @@ -4805,7 +4807,8 @@ char reset_menu() { lcd_puts_at_P(1, i, item[first + i]); } - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { if (lcd_encoder < 0) { From d6c81dab626462419ccae629ff09b143cf891acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 10:59:58 +0000 Subject: [PATCH 153/240] Fix manual fan check menu lcd_encoder was not being updated we need to call manage_inactivity Tested on MK3S+ Change in memory: Flash: +6 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f634d677c..10c83fec8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6939,6 +6939,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, manage_heater(); + manage_inactivity(true); _delay(100); } while (!lcd_clicked()); From 3dda8b5c00aaf14098841fc6762867efa13a506d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 11:05:50 +0000 Subject: [PATCH 154/240] optimise fan check selftest code Tested on MK3S+ Change in memory: Flash: -174 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 78 ++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 10c83fec8..21cce9fc7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -191,9 +191,9 @@ enum class TestError : uint_least8_t }; static uint8_t lcd_selftest_screen(TestScreen screen, uint8_t _progress, uint8_t _progress_scale, bool _clear, uint16_t _delay); -static void lcd_selftest_screen_step(uint8_t _row, uint8_t _col, uint8_t _state, const char *_name, const char _indicator); -static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, - bool _default=false); +static void lcd_selftest_screen_step(const uint8_t _row, const uint8_t _col, const uint8_t _state, const char *_name, const char _indicator); +static bool lcd_selftest_manual_fan_check(const uint8_t _fan, const bool check_opposite, + const bool _default=false); #ifdef FANCHECK /** Enumerate for lcd_selftest_fan_auto function. @@ -5027,16 +5027,22 @@ static void lcd_test_menu() } #endif //LCD_TEST +/// @brief Set print fan speed +/// @param speed ranges from 0 to 255 +static void lcd_selftest_setfan(const uint8_t speed) { + fanSpeed = speed; +#ifdef FAN_SOFT_PWM + fanSpeedSoftPwm = speed; +#endif + manage_heater(); +} + static bool fan_error_selftest() { #ifdef FANCHECK if (!fans_check_enabled) return 0; - fanSpeed = 255; -#ifdef FAN_SOFT_PWM - fanSpeedSoftPwm = 255; -#endif //FAN_SOFT_PWM - manage_heater(); //enables print fan + lcd_selftest_setfan(255); setExtruderAutoFanState(3); //force enables the hotend fan #ifdef FAN_SOFT_PWM extruder_autofan_last_check = _millis(); @@ -5044,12 +5050,8 @@ static bool fan_error_selftest() #endif //FAN_SOFT_PWM _delay(1000); //delay_keep_alive would turn off hotend fan, because temerature is too low (maybe) manage_heater(); - fanSpeed = 0; - setExtruderAutoFanState(1); //releases lock on the hotend fan -#ifdef FAN_SOFT_PWM - fanSpeedSoftPwm = 0; -#endif //FAN_SOFT_PWM - manage_heater(); + setExtruderAutoFanState(1); //releases lock on the hotend fan + lcd_selftest_setfan(0); #ifdef TACH_0 if (fan_speed[0] <= 20) { //hotend fan error LCD_ALERTMESSAGERPGM(MSG_FANCHECK_HOTEND); @@ -6878,8 +6880,8 @@ static bool selftest_irsensor() #endif //(FILAMENT_SENSOR_TYPE == FSENSOR_IR) || (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) #endif //FILAMENT_SENSOR -static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, - bool _default) +static bool lcd_selftest_manual_fan_check(const uint8_t _fan, const bool check_opposite, + const bool _default) { bool _result = check_opposite; @@ -6897,20 +6899,14 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, case 1: // object cooling fan lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_HOTEND_FAN) : _T(MSG_SELFTEST_PART_FAN)); - SET_OUTPUT(FAN_PIN); -#ifdef FAN_SOFT_PWM - fanSpeedSoftPwm = 255; -#else //FAN_SOFT_PWM - analogWrite(FAN_PIN, 255); -#endif //FAN_SOFT_PWM - + lcd_selftest_setfan(255); break; } _delay(500); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_putc_at(0, 3, '>'); - lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); + lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); lcd_encoder = _default; @@ -6922,52 +6918,30 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, if (lcd_encoder < 0) { _result = !check_opposite; lcd_putc_at(0, 2, '>'); - lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_putc_at(0, 3, ' '); - lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } if (lcd_encoder > 0) { _result = check_opposite; lcd_putc_at(0, 2, ' '); - lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_putc_at(0, 3, '>'); - lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } lcd_encoder = 0; } - manage_heater(); manage_inactivity(true); _delay(100); } while (!lcd_clicked()); KEEPALIVE_STATE(IN_HANDLER); - setExtruderAutoFanState(0); - SET_OUTPUT(FAN_PIN); -#ifdef FAN_SOFT_PWM - fanSpeedSoftPwm = 0; -#else //FAN_SOFT_PWM - analogWrite(FAN_PIN, 0); -#endif //FAN_SOFT_PWM - fanSpeed = 0; - manage_heater(); + setExtruderAutoFanState(0); // Turn off hotend fan + lcd_selftest_setfan(0); // Turn off print fan return _result; } #ifdef FANCHECK -// Set print fan speed -static void lcd_selftest_setfan(uint8_t speed) { - // set the fan speed - fanSpeed = speed; -#ifdef FAN_SOFT_PWM - fanSpeedSoftPwm = speed; -#endif - manage_heater(); -} - // Wait for the specified number of seconds while displaying some single-character indicator on the // screen coordinate col/row, then perform fan measurement static void lcd_selftest_measure_fans(uint8_t delay, uint8_t col, uint8_t row) { @@ -7098,21 +7072,19 @@ static uint8_t lcd_selftest_screen(TestScreen screen, uint8_t _progress, uint8_t return (_progress >= _progress_scale * 2) ? 0 : _progress; } -static void lcd_selftest_screen_step(uint8_t _row, uint8_t _col, uint8_t _state, const char *_name_PROGMEM, const char _indicator) +static void lcd_selftest_screen_step(const uint8_t _row, const uint8_t _col, const uint8_t _state, const char *_name_PROGMEM, const char _indicator) { lcd_set_cursor(_col, _row); - uint8_t strlenNameP = strlen_P(_name_PROGMEM); - switch (_state) { case 1: lcd_puts_P(_name_PROGMEM); - lcd_putc_at(_col + strlenNameP, _row, ':'); + lcd_putc(':'); lcd_putc(_indicator); break; case 2: lcd_puts_P(_name_PROGMEM); - lcd_putc_at(_col + strlenNameP, _row, ':'); + lcd_putc(':'); lcd_puts_P(MSG_OK_CAPS); break; default: From 4d90ecbcc47c5496e3de8eb091c62d14558a50b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Feb 2023 09:49:10 +0000 Subject: [PATCH 155/240] cleanup: remove ctype include We don't use any function from this header No change in code size --- Firmware/Tcodes.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp index c9a7f7238..c5453bd9e 100644 --- a/Firmware/Tcodes.cpp +++ b/Firmware/Tcodes.cpp @@ -7,7 +7,6 @@ #include "stepper.h" #include "ultralcd.h" #include -#include #include #include From 420f745bed3d02a29b3d23ad6bde351a36499773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Feb 2023 09:50:22 +0000 Subject: [PATCH 156/240] optimisation: mmu: combine if statements Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/mmu2_protocol_logic.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 441cdec1e..b7203fa5d 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -705,9 +705,8 @@ void ProtocolLogic::FormatLastResponseMsgAndClearLRB(char *dst) { *dst++ = '<'; for (uint8_t i = 0; i < lrb; ++i) { uint8_t b = lastReceivedBytes[i]; - if (b < 32) - b = '.'; - if (b > 127) + // Check for printable character, including space + if (b < 32 || b > 127) b = '.'; *dst++ = b; } @@ -721,9 +720,8 @@ void ProtocolLogic::LogRequestMsg(const uint8_t *txbuff, uint8_t size) { static char lastMsg[rqs] = ""; for (uint8_t i = 0; i < size; ++i) { uint8_t b = txbuff[i]; - if (b < 32) - b = '.'; - if (b > 127) + // Check for printable character, including space + if (b < 32 || b > 127) b = '.'; tmp[i + 1] = b; } From 2120d17912286f8f7a60ec91229edd0d367e54ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Feb 2023 12:45:48 +0000 Subject: [PATCH 157/240] optimisation: simplify T-code response for single material Extruder is always 0 Change in memory: Flash: -12 bytes SRAM: 0 bytes --- Firmware/Tcodes.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Firmware/Tcodes.cpp b/Firmware/Tcodes.cpp index c5453bd9e..a78010aec 100644 --- a/Firmware/Tcodes.cpp +++ b/Firmware/Tcodes.cpp @@ -79,8 +79,8 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) { } } } else { + SERIAL_ECHO_START; if (selectedSlot.slot >= EXTRUDERS) { - SERIAL_ECHO_START; SERIAL_ECHO('T'); SERIAL_ECHOLN(selectedSlot.slot + '0'); SERIAL_ECHOLNRPGM(_n("Invalid extruder")); ////MSG_INVALID_EXTRUDER @@ -91,9 +91,7 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) { // feedrate = next_feedrate; // } // } - SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n("Active Extruder: ")); ////MSG_ACTIVE_EXTRUDER - SERIAL_ECHOLN(active_extruder + '0'); // this is not changed in our FW at all, can be optimized away + SERIAL_ECHORPGM(_n("Active Extruder: 0")); ////MSG_ACTIVE_EXTRUDER } } } From 3cd97a5e8fc85951bcbe52f0193c6fc2b57a9498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Feb 2023 13:18:53 +0000 Subject: [PATCH 158/240] optimsation: draw cursor and set position with one function Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a53a25ba1..e23fa50ff 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5891,8 +5891,7 @@ void lcd_sdcard_menu() if (_md->lcd_scrollTimer.expired(300) || rewindFlag) { uint8_t len = LCD_WIDTH - ((_md->isDir)? 2 : 1); - lcd_set_cursor(0, _md->row); - lcd_print('>'); + lcd_putc_at(0, _md->row, '>'); if (_md->isDir) lcd_print(LCD_STR_FOLDER[0]); From 66e629ba74374311848bf1d2643b717b5e27183b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 19:56:24 +0000 Subject: [PATCH 159/240] cleanup: remove unused variable FSensorStateMenu --- Firmware/ultralcd.cpp | 2 -- Firmware/ultralcd.h | 1 - 2 files changed, 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e23fa50ff..f6f613e0a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -67,8 +67,6 @@ uint8_t scrollstuff = 0; int8_t SilentModeMenu = SILENT_MODE_OFF; -int8_t FSensorStateMenu = 1; - LcdCommands lcd_commands_type = LcdCommands::Idle; static uint8_t lcd_commands_step = 0; static bool extraPurgeNeeded = false; ///< lcd_commands - detect if extra purge after MMU-toolchange is necessary or not diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 96ceac1fe..5912ee0d5 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -125,7 +125,6 @@ enum class LcdCommands : uint_least8_t }; extern LcdCommands lcd_commands_type; -extern int8_t FSensorStateMenu; enum class CustomMsg : uint_least8_t { From ab934f8ba52bf4df438b49c758a05515f159d067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 20:22:40 +0000 Subject: [PATCH 160/240] optimisation: make clock_interval static and 1 byte Change in memory: Flash: -16 bytes SRAM: -1 byte --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f6f613e0a..a3bdacb62 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -50,7 +50,6 @@ #include "Prusa_farm.h" -int clock_interval = 0; static void lcd_sd_updir(); static void lcd_mesh_bed_leveling_settings(); #ifdef LCD_BL_PIN @@ -451,6 +450,7 @@ void lcdui_print_cmd_diag(void) // Print time (8 chars total) void lcdui_print_time(void) { + static uint8_t clock_interval; // max value is 10: CLOCK_INTERVAL_TIME * 2 //if remaining print time estimation is available print it else print elapsed time int chars = 0; if (printer_active()) { From 6e02a082e2364d00d3c1a5a354977f4586ec0793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 21:08:23 +0000 Subject: [PATCH 161/240] cleanup: make heating_status_counter static Change in memory: Flash: 0 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 1 - Firmware/ultralcd.cpp | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 28ebf9f11..f058ad66f 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -319,7 +319,6 @@ extern uint32_t total_filament_used; // mm/100 or 10um /// @param _total_filament_used has unit mm/100 or 10um /// @param _total_print_time has unit minutes, for example 123 minutes void save_statistics(uint32_t _total_filament_used, uint32_t _total_print_time); -extern uint8_t heating_status_counter; extern bool fan_state[2]; extern int fan_edge_counter[2]; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a124c9be0..53cec9d48 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -183,7 +183,6 @@ bool mesh_bed_leveling_flag = false; uint32_t total_filament_used; HeatingStatus heating_status; -uint8_t heating_status_counter; bool loading_flag = false; #define XY_NO_RESTORE_FLAG (mesh_bed_leveling_flag || homing_flag) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a3bdacb62..ccdacaf34 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -514,6 +514,7 @@ void lcdui_print_time(void) //! @Brief Print status line on status screen void lcdui_print_status_line(void) { + static uint8_t heating_status_counter; if (heating_status != HeatingStatus::NO_HEATING) { // If heating flag, show progress of heating heating_status_counter++; if (heating_status_counter > 13) { From 6aafbe69a81ecfc4b903841bb4b66abb50b23fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 21:17:43 +0000 Subject: [PATCH 162/240] cleanup: remove unused function declaration --- Firmware/Marlin.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index f058ad66f..c65ec9d3d 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -423,7 +423,6 @@ void setup_fan_interrupt(); extern bool recover_machine_state_after_power_panic(); extern void restore_print_from_eeprom(bool mbl_was_active); -extern void position_menu(); extern void print_world_coordinates(); extern void print_physical_coordinates(); From 7a8dfdae53066bfea63d22f39f68ac25fa53f396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 22:18:17 +0000 Subject: [PATCH 163/240] optimisation: use new EEPROM init method for fCheckModeInit Change in memory: Flash: -90 bytes SRAM: 0 bytes --- Firmware/util.cpp | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 1998412ee..f34ed74db 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -247,36 +247,15 @@ ClCheckVersion oCheckVersion=ClCheckVersion::_None; ClCheckGcode oCheckGcode=ClCheckGcode::_None; void fCheckModeInit() { - oCheckMode = (ClCheckMode)eeprom_read_byte((uint8_t *)EEPROM_CHECK_MODE); - if (oCheckMode == ClCheckMode::_Undef) { - oCheckMode = ClCheckMode::_Warn; - eeprom_update_byte((uint8_t *)EEPROM_CHECK_MODE, (uint8_t)oCheckMode); - } - if (farm_mode) { - oCheckMode = ClCheckMode::_Strict; - eeprom_init_default_word((uint16_t *)EEPROM_NOZZLE_DIAMETER_uM, EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); - } - oNozzleDiameter = (ClNozzleDiameter)eeprom_read_byte((uint8_t *)EEPROM_NOZZLE_DIAMETER); - if ((oNozzleDiameter == ClNozzleDiameter::_Diameter_Undef) && !farm_mode) { - oNozzleDiameter = ClNozzleDiameter::_Diameter_400; - eeprom_update_byte((uint8_t *)EEPROM_NOZZLE_DIAMETER, (uint8_t)oNozzleDiameter); - eeprom_update_word((uint16_t *)EEPROM_NOZZLE_DIAMETER_uM, EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); - } - oCheckModel = (ClCheckModel)eeprom_read_byte((uint8_t *)EEPROM_CHECK_MODEL); - if (oCheckModel == ClCheckModel::_Undef) { - oCheckModel = ClCheckModel::_Warn; - eeprom_update_byte((uint8_t *)EEPROM_CHECK_MODEL, (uint8_t)oCheckModel); - } - oCheckVersion = (ClCheckVersion)eeprom_read_byte((uint8_t *)EEPROM_CHECK_VERSION); - if (oCheckVersion == ClCheckVersion::_Undef) { - oCheckVersion = ClCheckVersion::_Warn; - eeprom_update_byte((uint8_t *)EEPROM_CHECK_VERSION, (uint8_t)oCheckVersion); - } - oCheckGcode = (ClCheckGcode)eeprom_read_byte((uint8_t *)EEPROM_CHECK_GCODE); - if (oCheckGcode == ClCheckGcode::_Undef) { - oCheckGcode = ClCheckGcode::_Warn; - eeprom_update_byte((uint8_t *)EEPROM_CHECK_GCODE, (uint8_t)oCheckGcode); - } + oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, farm_mode ? (uint8_t) ClCheckMode::_Strict : (uint8_t)ClCheckMode::_Warn); + + // Note, farm mode leaves EEPROM_NOZZLE_DIAMETER setting uninitalised + oNozzleDiameter = (ClNozzleDiameter)eeprom_init_default_byte((uint8_t *)EEPROM_NOZZLE_DIAMETER, farm_mode ? (uint8_t)ClNozzleDiameter::_Diameter_Undef : (uint8_t)ClNozzleDiameter::_Diameter_400); + eeprom_init_default_word((uint16_t *)EEPROM_NOZZLE_DIAMETER_uM, EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); + + oCheckModel = (ClCheckModel)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODEL, (uint8_t)ClCheckModel::_Warn); + oCheckVersion = (ClCheckVersion)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_VERSION, (uint8_t)ClCheckVersion::_Warn); + oCheckGcode = (ClCheckGcode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_GCODE, (uint8_t)ClCheckGcode::_Warn); } static void render_M862_warnings(const char* warning, const char* strict, uint8_t check) From cd8a22d6b3a59c98795f171ac1149e6fc9536efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Feb 2023 22:20:31 +0000 Subject: [PATCH 164/240] optimisation: utils: don't initialise global variables They will be set by fCheckModeInit() by reading from EEPROM Change in memory: Flash: -2 bytes SRAM: -1 byte --- Firmware/util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index f34ed74db..464f90f40 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -240,11 +240,11 @@ void update_current_firmware_version_to_eeprom() eeprom_update_word((uint16_t*)EEPROM_FIRMWARE_VERSION_FLAVOR, (uint16_t)pgm_read_word(&FW_VERSION_NR[3])); } -ClNozzleDiameter oNozzleDiameter=ClNozzleDiameter::_Diameter_400; -ClCheckMode oCheckMode=ClCheckMode::_None; -ClCheckModel oCheckModel=ClCheckModel::_None; -ClCheckVersion oCheckVersion=ClCheckVersion::_None; -ClCheckGcode oCheckGcode=ClCheckGcode::_None; +ClNozzleDiameter oNozzleDiameter; +ClCheckMode oCheckMode; +ClCheckModel oCheckModel; +ClCheckVersion oCheckVersion; +ClCheckGcode oCheckGcode; void fCheckModeInit() { oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, farm_mode ? (uint8_t) ClCheckMode::_Strict : (uint8_t)ClCheckMode::_Warn); From 62cbc829f678aa82d9c87b1bca4d2caca7213d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 20 Feb 2023 19:39:03 +0000 Subject: [PATCH 165/240] optimisation: use new eeprom methods in check_printer_version() Change in memory: Flash: -48 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 53cec9d48..713a1be90 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -875,17 +875,11 @@ static void check_if_fw_is_on_right_printer() { uint8_t check_printer_version() { uint8_t version_changed = 0; - uint16_t printer_type = eeprom_read_word((uint16_t*)EEPROM_PRINTER_TYPE); - uint16_t motherboard = eeprom_read_word((uint16_t*)EEPROM_BOARD_TYPE); + uint16_t printer_type = eeprom_init_default_word((uint16_t*)EEPROM_PRINTER_TYPE, PRINTER_TYPE); + uint16_t motherboard = eeprom_init_default_word((uint16_t*)EEPROM_BOARD_TYPE, MOTHERBOARD); - if (printer_type != PRINTER_TYPE) { - if (printer_type == 0xffff) eeprom_write_word((uint16_t*)EEPROM_PRINTER_TYPE, PRINTER_TYPE); - else version_changed |= 0b10; - } - if (motherboard != MOTHERBOARD) { - if(motherboard == 0xffff) eeprom_write_word((uint16_t*)EEPROM_BOARD_TYPE, MOTHERBOARD); - else version_changed |= 0b01; - } + if (printer_type != PRINTER_TYPE) version_changed |= 0b10; + if (motherboard != MOTHERBOARD) version_changed |= 0b01; return version_changed; } From 70dadc4202f7f03a800678fdd3963a84d7b08122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 26 Feb 2023 17:13:25 +0000 Subject: [PATCH 166/240] M115: Extruder count is always 1 Change in memory: Flash: -8 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 713a1be90..3a0fe8a1f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6465,10 +6465,9 @@ Sigma_Exit: SERIAL_ECHOPGM(" based on Marlin FIRMWARE_URL:https://github.com/prusa3d/Prusa-Firmware PROTOCOL_VERSION:"); SERIAL_ECHOPGM(PROTOCOL_VERSION); SERIAL_ECHOPGM(" MACHINE_TYPE:"); - SERIAL_ECHOPGM(CUSTOM_MENDEL_NAME); - SERIAL_ECHOPGM(" EXTRUDER_COUNT:"); - SERIAL_ECHOPGM(STRINGIFY(EXTRUDERS)); - SERIAL_ECHOPGM(" UUID:"); + SERIAL_ECHOPGM(CUSTOM_MENDEL_NAME); + SERIAL_ECHOPGM(" EXTRUDER_COUNT:1"); + SERIAL_ECHOPGM(" UUID:"); SERIAL_ECHOLNPGM(MACHINE_UUID); #ifdef EXTENDED_CAPABILITIES_REPORT extended_capabilities_report(); From bd796a2cb39ab6ca051e55c7d4fe3ff4adbaeaba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 27 Feb 2023 20:07:51 +0000 Subject: [PATCH 167/240] optimisation: more lcd_putc_at Change in memory: Flash: -18 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ccdacaf34..cea59aaf6 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2747,10 +2747,9 @@ bool lcd_wait_for_pinda(float temp) { while (current_temperature_pinda > temp){ lcd_display_message_fullscreen_P(_i("Waiting for PINDA probe cooling"));////MSG_WAITING_TEMP_PINDA c=20 r=3 - lcd_set_cursor(0, 4); - lcd_print(LCD_STR_THERMOMETER[0]); + lcd_putc_at(0, 4, LCD_STR_THERMOMETER[0]); lcd_printf_P(PSTR("%3d/%3d"), (int16_t)current_temperature_pinda, (int16_t) temp); - lcd_print(LCD_STR_DEGREE[0]); + lcd_putc(LCD_STR_DEGREE[0]); delay_keep_alive(1000); serialecho_temperatures(); if (pinda_timeout.expired(8 * 60 * 1000ul)) { //PINDA cooling from 60 C to 35 C takes about 7 minutes @@ -2765,10 +2764,9 @@ bool lcd_wait_for_pinda(float temp) { void lcd_wait_for_heater() { lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); - lcd_set_cursor(0, 4); - lcd_print(LCD_STR_THERMOMETER[0]); + lcd_putc_at(0, 4, LCD_STR_THERMOMETER[0]); lcd_printf_P(PSTR("%3d/%3d"), (int16_t)degHotend(active_extruder), (int16_t) degTargetHotend(active_extruder)); - lcd_print(LCD_STR_DEGREE[0]); + lcd_putc(LCD_STR_DEGREE[0]); } void lcd_wait_for_cool_down() { @@ -2779,15 +2777,13 @@ void lcd_wait_for_cool_down() { while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) { lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=4 - lcd_set_cursor(0, 4); - lcd_print(LCD_STR_THERMOMETER[0]); + lcd_putc_at(0, 4, LCD_STR_THERMOMETER[0]); lcd_printf_P(PSTR("%3d/0"), (int16_t)degHotend(0)); - lcd_print(LCD_STR_DEGREE[0]); + lcd_putc(LCD_STR_DEGREE[0]); - lcd_set_cursor(9, 4); - lcd_print(LCD_STR_BEDTEMP[0]); + lcd_putc_at(9, 4, LCD_STR_BEDTEMP[0]); lcd_printf_P(PSTR("%3d/0"), (int16_t)degBed()); - lcd_print(LCD_STR_DEGREE[0]); + lcd_putc(LCD_STR_DEGREE[0]); delay_keep_alive(1000); serialecho_temperatures(); } From 66bb9bcfe4ad86b10290a8cd0bb94c512fb76185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 27 Feb 2023 20:15:28 +0000 Subject: [PATCH 168/240] optimisation: lcd_temp_cal_show_result result is boolean so always update the EEPROM Change in memory: Flash: -20 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cea59aaf6..a299dc0b9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3223,17 +3223,16 @@ void lcd_temp_cal_show_result(bool result) { disable_e2(); setTargetBed(0); //set bed target temperature back to 0 - if (result == true) { - eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1); + // Store boolean result + eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, result); + eeprom_update_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE, result); + + if (result) { SERIAL_ECHOLNPGM("PINDA calibration done. Continue with pressing the knob."); lcd_show_fullscreen_message_and_wait_P(_T(MSG_PINDA_CALIBRATION_DONE)); - eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 1); - } - else { - eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 0); + } else { SERIAL_ECHOLNPGM("PINDA calibration failed. Continue with pressing the knob."); lcd_show_fullscreen_message_and_wait_P(_i("PINDA calibration failed"));////MSG_PINDA_CAL_FAILED c=20 r=4 - eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 0); } lcd_update_enable(true); lcd_update(2); From 69b4696114ef2732589dfc05d47892a4afd58a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 20 Mar 2023 18:53:30 +0000 Subject: [PATCH 169/240] use lcd_puts_P instead of lcd_printf_P Change in memory: Flash: -8 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a299dc0b9..82c72a5b8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5922,7 +5922,7 @@ void lcd_belttest() uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); - lcd_printf_P(_T(MSG_CHECKING_X)); + lcd_puts_P(_T(MSG_CHECKING_X)); lcd_set_cursor(0,1), lcd_printf_P(PSTR("X: %u -> ..."),X); KEEPALIVE_STATE(IN_HANDLER); From 7ff514621cba399a72e70ffca289a6f8207573d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 4 Apr 2023 17:04:58 +0000 Subject: [PATCH 170/240] cleanup: remove unused global variable --- Firmware/tmc2130.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index d4ccf835c..65c7abd37 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -65,7 +65,6 @@ tmc2130_chopper_config_t tmc2130_chopper_config[4] = { }; bool tmc2130_sg_stop_on_crash = true; -uint8_t tmc2130_sg_diag_mask = 0x00; uint8_t tmc2130_sg_crash = 0; //used for triggering a periodic check (1s) of the overtemperature pre-warning flag at ~120C (+-20C) From 00ffab8f6259191efa08e1c5620af2b497489921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 9 Apr 2023 13:51:28 +0000 Subject: [PATCH 171/240] optimisation: combine if statements in Sensors menu FINDA status is always 0 or 1 Change in memory: Flash: -28 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 82c72a5b8..825e7e778 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3297,20 +3297,15 @@ static void lcd_show_sensors_state() { //0: N/A; 1: OFF; 2: ON uint8_t pinda_state = STATE_NA; - uint8_t finda_state = STATE_NA; uint8_t idler_state = STATE_NA; pinda_state = READ(Z_MIN_PIN); - if (MMU2::mmu2.Enabled()) - { - finda_state = MMU2::mmu2.FindaDetectsFilament(); - } lcd_puts_at_P(0, 0, MSG_PINDA); lcd_set_cursor(LCD_WIDTH - 14, 0); lcd_print_state(pinda_state); - if (MMU2::mmu2.Enabled()) - { + if (MMU2::mmu2.Enabled()) { + const uint8_t finda_state = MMU2::mmu2.FindaDetectsFilament(); lcd_puts_at_P(10, 0, _n("FINDA"));////MSG_FINDA c=5 lcd_set_cursor(LCD_WIDTH - 3, 0); lcd_print_state(finda_state); From d175dba6690060125e345cc0fc982af13fc98cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 9 Apr 2023 13:58:12 +0000 Subject: [PATCH 172/240] optimisation: use expired_cont is specific places !variable.running() || variable.expired() is equal to variable.expired_cont() The latter required less flash memory Change in memory: Flash: -28 bytes SRAM: 0 bytes --- Firmware/Filament_sensor.cpp | 2 +- Firmware/temperature.cpp | 4 ++-- Firmware/tmc2130.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index ca89fa54f..e298e6035 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -498,7 +498,7 @@ bool PAT9125_sensor::updatePAT9125() { } } - if (!pollingTimer.running() || pollingTimer.expired(pollingPeriod)) { + if (pollingTimer.expired_cont(pollingPeriod)) { pollingTimer.start(); if (!pat9125_update()) { init(); // try to reinit. diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5dab747bd..447a39cd5 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2261,7 +2261,7 @@ static void check_min_temp_raw() if(target_temperature_isr[active_extruder]>minttemp[active_extruder]) { // ~ nozzle heating is on bCheckingOnHeater=bCheckingOnHeater||(current_temperature_isr[active_extruder]>(minttemp[active_extruder]+TEMP_HYSTERESIS)); // for eventually delay cutting - if(oTimer4minTempHeater.expired(HEATER_MINTEMP_DELAY)||(!oTimer4minTempHeater.running())||bCheckingOnHeater) { + if(oTimer4minTempHeater.expired_cont(HEATER_MINTEMP_DELAY) || bCheckingOnHeater) { bCheckingOnHeater=true; // not necessary check_min_temp_heater0(); // delay is elapsed or temperature is/was over minTemp => periodical checking is active } @@ -2275,7 +2275,7 @@ static void check_min_temp_raw() if(target_temperature_bed_isr>BED_MINTEMP) { // ~ bed heating is on bCheckingOnBed=bCheckingOnBed||(current_temperature_bed_isr>(BED_MINTEMP+TEMP_HYSTERESIS)); // for eventually delay cutting - if(oTimer4minTempBed.expired(BED_MINTEMP_DELAY)||(!oTimer4minTempBed.running())||bCheckingOnBed) { + if(oTimer4minTempBed.expired_cont(BED_MINTEMP_DELAY) || bCheckingOnBed) { bCheckingOnBed=true; // not necessary check_min_temp_bed(); // delay is elapsed or temperature is/was over minTemp => periodical checking is active } diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 65c7abd37..4947ea678 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -357,7 +357,7 @@ bool tmc2130_wait_standstill_xy(int timeout) void tmc2130_check_overtemp() { - if (tmc2130_overtemp_timer.expired(1000) || !tmc2130_overtemp_timer.running()) + if (tmc2130_overtemp_timer.expired_cont(1000)) { for (uint_least8_t i = 0; i < 4; i++) { From ea7b395852e6d576127d037266f4176ada1366da Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 20:31:10 +0200 Subject: [PATCH 173/240] Remove useless parantheses Found these a few months ago when I was trying some other optimization. Don't want to make a PR just for this, so I'll just slide it here in this existing PR. --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3a0fe8a1f..43491809c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7508,7 +7508,7 @@ Sigma_Exit: { lang_reset(); SERIAL_ECHO_START; - SERIAL_PROTOCOLPGM(("LANG SEL FORCED")); + SERIAL_PROTOCOLPGM("LANG SEL FORCED"); } break; #ifdef ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED From c7de1b1416b53198b87cb5c7e127c60b1061e83b Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 18:08:46 +0200 Subject: [PATCH 174/240] optimize get_coordinates() axis mask --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 43491809c..1e56d1ad3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9145,10 +9145,10 @@ void update_currents() { void get_coordinates() { bool seen[4]={false,false,false,false}; - for(int8_t i=0; i < NUM_AXIS; i++) { + for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i < NUM_AXIS; i++, mask <<= 1) { if(code_seen(axis_codes[i])) { - bool relative = axis_relative_modes & (1 << i); + bool relative = axis_relative_modes & mask; destination[i] = code_value(); if (i == E_AXIS) { float emult = extruder_multiplier[active_extruder]; From d148c08991e56fbfd74873af9bc3bc0752210d13 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 9 Apr 2023 18:09:40 +0200 Subject: [PATCH 175/240] Remove dead code from get_coordinates() --- Firmware/Marlin_main.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1e56d1ad3..3cd76496f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9144,7 +9144,6 @@ void update_currents() { #endif //MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3 void get_coordinates() { - bool seen[4]={false,false,false,false}; for (uint8_t i = X_AXIS, mask = X_AXIS_MASK; i < NUM_AXIS; i++, mask <<= 1) { if(code_seen(axis_codes[i])) { @@ -9162,7 +9161,6 @@ void get_coordinates() { } if (relative) destination[i] += current_position[i]; - seen[i]=true; #if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3 if (i == Z_AXIS && SilentModeMenu == SILENT_MODE_AUTO) update_currents(); #endif //MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3 @@ -9172,11 +9170,6 @@ void get_coordinates() { if(code_seen('F')) { next_feedrate = code_value(); if(next_feedrate > 0.0) feedrate = next_feedrate; - if (!seen[0] && !seen[1] && !seen[2] && seen[3]) - { -// float e_max_speed = -// printf_P(PSTR("E MOVE speed %7.3f\n"), feedrate / 60) - } } } From 7c23d8b00c7ca9a8b80bff86148a684857d90406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 21:17:51 +0000 Subject: [PATCH 176/240] cleanup: make cancel_heatup static in Marlin_main --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3cd76496f..e59718cb3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -244,7 +244,7 @@ uint8_t newFanSpeed = 0; bool powersupply = true; #endif -bool cancel_heatup = false; +static bool cancel_heatup = false; int8_t busy_state = NOT_BUSY; static long prev_busy_signal_ms = -1; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 5912ee0d5..8e85e9364 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -163,7 +163,6 @@ void printf_IRSensorAnalogBoardChange(); extern int8_t SilentModeMenu; -extern bool cancel_heatup; extern bool isPrintPaused; extern uint8_t scrollstuff; From ebdcfbec50b4e3bbf6e37c17dc609fcc28b1a48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 11 Apr 2023 21:37:00 +0000 Subject: [PATCH 177/240] cleanup: tmc2130: make variables static where applicable No change in memory --- Firmware/tmc2130.cpp | 20 ++++++++++---------- Firmware/tmc2130.h | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 4947ea678..7487de10a 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -23,32 +23,32 @@ uint8_t tmc2130_current_h[4] = TMC2130_CURRENTS_H; uint8_t tmc2130_current_r[4] = TMC2130_CURRENTS_R; //running currents for homing -uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; +static uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; //pwm_ampl -uint8_t tmc2130_pwm_ampl[4] = {TMC2130_PWM_AMPL_X, TMC2130_PWM_AMPL_Y, TMC2130_PWM_AMPL_Z, TMC2130_PWM_AMPL_E}; +static uint8_t tmc2130_pwm_ampl[4] = {TMC2130_PWM_AMPL_X, TMC2130_PWM_AMPL_Y, TMC2130_PWM_AMPL_Z, TMC2130_PWM_AMPL_E}; //pwm_grad -uint8_t tmc2130_pwm_grad[4] = {TMC2130_PWM_GRAD_X, TMC2130_PWM_GRAD_Y, TMC2130_PWM_GRAD_Z, TMC2130_PWM_GRAD_E}; +static uint8_t tmc2130_pwm_grad[4] = {TMC2130_PWM_GRAD_X, TMC2130_PWM_GRAD_Y, TMC2130_PWM_GRAD_Z, TMC2130_PWM_GRAD_E}; //pwm_auto -uint8_t tmc2130_pwm_auto[4] = {TMC2130_PWM_AUTO_X, TMC2130_PWM_AUTO_Y, TMC2130_PWM_AUTO_Z, TMC2130_PWM_AUTO_E}; +static uint8_t tmc2130_pwm_auto[4] = {TMC2130_PWM_AUTO_X, TMC2130_PWM_AUTO_Y, TMC2130_PWM_AUTO_Z, TMC2130_PWM_AUTO_E}; //pwm_freq -uint8_t tmc2130_pwm_freq[4] = {TMC2130_PWM_FREQ_X, TMC2130_PWM_FREQ_Y, TMC2130_PWM_FREQ_Z, TMC2130_PWM_FREQ_E}; +static uint8_t tmc2130_pwm_freq[4] = {TMC2130_PWM_FREQ_X, TMC2130_PWM_FREQ_Y, TMC2130_PWM_FREQ_Z, TMC2130_PWM_FREQ_E}; uint8_t tmc2130_mres[4] = {0, 0, 0, 0}; //will be filed at begin of init uint8_t tmc2130_sg_thr[4] = {TMC2130_SG_THRS_X, TMC2130_SG_THRS_Y, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E}; -uint8_t tmc2130_sg_thr_home[4] = TMC2130_SG_THRS_HOME; +static uint8_t tmc2130_sg_thr_home[4] = TMC2130_SG_THRS_HOME; uint8_t tmc2130_sg_homing_axes_mask = 0x00; const char eMotorCurrentScalingEnabled[] PROGMEM = "E-motor current scaling enabled"; -uint8_t tmc2130_sg_measure = 0xff; -uint32_t tmc2130_sg_measure_cnt = 0; -uint32_t tmc2130_sg_measure_val = 0; +static uint8_t tmc2130_sg_measure = 0xff; +static uint32_t tmc2130_sg_measure_cnt = 0; +static uint32_t tmc2130_sg_measure_val = 0; uint8_t tmc2130_home_enabled = 0; uint8_t tmc2130_home_origin[2] = {0, 0}; @@ -68,7 +68,7 @@ bool tmc2130_sg_stop_on_crash = true; uint8_t tmc2130_sg_crash = 0; //used for triggering a periodic check (1s) of the overtemperature pre-warning flag at ~120C (+-20C) -ShortTimer tmc2130_overtemp_timer; +static ShortTimer tmc2130_overtemp_timer; #define DBG(args...) //printf_P(args) diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 7152091cb..30aa1b2db 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -16,10 +16,6 @@ extern uint8_t tmc2130_sg_thr[4]; extern bool tmc2130_sg_stop_on_crash; extern uint8_t tmc2130_sg_crash; //crash mask -extern uint8_t tmc2130_sg_measure; -extern uint32_t tmc2130_sg_measure_cnt; -extern uint32_t tmc2130_sg_measure_val; - extern uint8_t tmc2130_sg_homing_axes_mask; extern const char eMotorCurrentScalingEnabled[]; From b67c359129d9b970980d3ef3a5ba6091d39636d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Apr 2023 17:23:48 +0000 Subject: [PATCH 178/240] Move fan_state to fancheck.cpp and make it static No change in memory --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 2 +- Firmware/fancheck.cpp | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c65ec9d3d..9628219e3 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -320,7 +320,6 @@ extern uint32_t total_filament_used; // mm/100 or 10um /// @param _total_print_time has unit minutes, for example 123 minutes void save_statistics(uint32_t _total_filament_used, uint32_t _total_print_time); -extern bool fan_state[2]; extern int fan_edge_counter[2]; extern int fan_speed[2]; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e59718cb3..3762cc0f4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -188,7 +188,7 @@ bool loading_flag = false; #define XY_NO_RESTORE_FLAG (mesh_bed_leveling_flag || homing_flag) -bool fan_state[2]; + int fan_edge_counter[2]; int fan_speed[2]; diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index 4e6ae2741..236db6c53 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -220,6 +220,7 @@ void checkExtruderAutoFans() #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) void readFanTach() { + static bool fan_state[2]; #ifdef FAN_SOFT_PWM if (READ(TACH_0) != fan_state[0]) { if(fan_measuring) fan_edge_counter[0] ++; From 583c46a63fa13783eed8ed091b741ab48ebc3ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Apr 2023 17:27:04 +0000 Subject: [PATCH 179/240] Simplify two fan_check_error checks There are only 3 possible values. No need to check for two of them to rule of the last value. Instead simply check for the last value only. Change in memory: Flash: -16 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 8 ++++---- Firmware/ultralcd.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3762cc0f4..2ac9d1309 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -11135,11 +11135,11 @@ void restore_extruder_temperature_from_ram() { //! @param e_move void restore_print_from_ram_and_continue(float e_move) { - if (!saved_printing) return; - + if (!saved_printing) return; + #ifdef FANCHECK - // Do not allow resume printing if fans are still not ok - if ((fan_check_error != EFCE_OK) && (fan_check_error != EFCE_FIXED)) return; + // Do not allow resume printing if fans are still not ok + if (fan_check_error == EFCE_REPORTED) return; if (fan_check_error == EFCE_FIXED) fan_check_error = EFCE_OK; //reenable serial stream processing if printing from usb #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 825e7e778..e811235d5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5283,7 +5283,7 @@ static void lcd_main_menu() // only allow resuming if hardware errors (temperature or fan) are cleared if(!get_temp_error() #ifdef FANCHECK - && ((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) + && fan_check_error != EFCE_REPORTED #endif //FANCHECK ) { if (saved_printing) { From 87e40f1cee5dd5d899c18f18290728654e1bcb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 11:19:52 +0000 Subject: [PATCH 180/240] optimisation: lcd_putc_at in belt test Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e811235d5..d638779ab 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5932,8 +5932,7 @@ void lcd_belttest() { Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); lcd_set_cursor(10,3),lcd_printf_P(PSTR("%u"),Y); - lcd_set_cursor(19, 3); - lcd_print(LCD_STR_UPLEVEL[0]); + lcd_putc_at(19, 3, LCD_STR_UPLEVEL[0]); lcd_wait_for_click_delay(10); } } From 9f66eceb2954387ad296d55deb5d91c93663ee05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 11:28:37 +0000 Subject: [PATCH 181/240] optimisation: belt test new values use lcd_print instead of lcd_printf_P to print the number only Tested on MK3S+ Change in memory: Flash: -34 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d638779ab..415642d5d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5925,13 +5925,15 @@ void lcd_belttest() // that clobbers ours, with more info than we could provide. So on fail we just fall through to take us back to status. if (lcd_selfcheck_axis_sg(X_AXIS)){ X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); - lcd_set_cursor(10,1), lcd_printf_P(PSTR("%u"),X); // Show new X value next to old one. - lcd_puts_at_P(0,2,_T(MSG_CHECKING_Y)); - lcd_set_cursor(0,3), lcd_printf_P(PSTR("Y: %u -> ..."),Y); + lcd_set_cursor(10, 1); + lcd_print(X); // Show new X value next to old one. + lcd_puts_at_P(0, 2, _T(MSG_CHECKING_Y)); + lcd_set_cursor(0, 3), lcd_printf_P(PSTR("Y: %u -> ..."),Y); if (lcd_selfcheck_axis_sg(Y_AXIS)) { Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); - lcd_set_cursor(10,3),lcd_printf_P(PSTR("%u"),Y); + lcd_set_cursor(10, 3); + lcd_print(Y); lcd_putc_at(19, 3, LCD_STR_UPLEVEL[0]); lcd_wait_for_click_delay(10); } From dea7f2b26cc78a62ce4a2dc4345178a27e8313f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 12:14:53 +0000 Subject: [PATCH 182/240] Resolve PR review Initialise EEPROM_CHECK_MODE always But if farm mode is detected, update the Check mode to Strict Initialise EEPROM_NOZZLE_DIAMETER on farm mode. When opening the menus this value is set automatically to _Diameter_400 anyway so this should be fine. No change in memory on Multilang build --- Firmware/util.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 464f90f40..466c8e19b 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -247,10 +247,14 @@ ClCheckVersion oCheckVersion; ClCheckGcode oCheckGcode; void fCheckModeInit() { - oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, farm_mode ? (uint8_t) ClCheckMode::_Strict : (uint8_t)ClCheckMode::_Warn); + oCheckMode = (ClCheckMode)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODE, (uint8_t)ClCheckMode::_Warn); - // Note, farm mode leaves EEPROM_NOZZLE_DIAMETER setting uninitalised - oNozzleDiameter = (ClNozzleDiameter)eeprom_init_default_byte((uint8_t *)EEPROM_NOZZLE_DIAMETER, farm_mode ? (uint8_t)ClNozzleDiameter::_Diameter_Undef : (uint8_t)ClNozzleDiameter::_Diameter_400); + if (farm_mode) { + oCheckMode = ClCheckMode::_Strict; + eeprom_update_byte((uint8_t *)EEPROM_CHECK_MODE, (uint8_t)ClCheckMode::_Strict); + } + + oNozzleDiameter = (ClNozzleDiameter)eeprom_init_default_byte((uint8_t *)EEPROM_NOZZLE_DIAMETER, (uint8_t)ClNozzleDiameter::_Diameter_400); eeprom_init_default_word((uint16_t *)EEPROM_NOZZLE_DIAMETER_uM, EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); oCheckModel = (ClCheckModel)eeprom_init_default_byte((uint8_t *)EEPROM_CHECK_MODEL, (uint8_t)ClCheckModel::_Warn); From 9b6e1babcb216d7b3b398cfb2a938ccecf298555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 13:40:41 +0000 Subject: [PATCH 183/240] many more lcd_putc_at optimisations Changes in lcd_implementation_drawmenu_sdfile and lcd_implementation_drawmenu_sddirectory seem to save the most. Change in memory: Flash: -72 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 3 +-- Firmware/menu.cpp | 9 +++------ Firmware/ultralcd.cpp | 22 +++++++--------------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2ac9d1309..d41b2d3bf 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -622,8 +622,7 @@ void crashdet_detected(uint8_t mask) lcd_print(msg); // ask whether to resume printing - lcd_set_cursor(0, 1); - lcd_puts_P(_T(MSG_RESUME_PRINT)); + lcd_puts_at_P(0, 1, _T(MSG_RESUME_PRINT)); lcd_putc('?'); uint8_t yesno = lcd_show_yes_no_and_wait(false); if (yesno == LCD_LEFT_BUTTON_CHOICE) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 92ccbddd5..283df19b8 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -159,8 +159,7 @@ static char menu_selection_mark(){ static void menu_draw_item_puts_P(char type_char, const char* str) { - lcd_set_cursor(0, menu_row); - lcd_putc(menu_selection_mark()); + lcd_putc_at(0, menu_row, menu_selection_mark()); lcd_print_pad_P(str, LCD_WIDTH - 2); lcd_putc(type_char); } @@ -218,10 +217,9 @@ void menu_format_sheet_select_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) static void menu_draw_item_select_sheet_E(char type_char, const Sheet &sheet) { - lcd_set_cursor(0, menu_row); SheetFormatBuffer buffer; menu_format_sheet_select_E(sheet, buffer); - lcd_putc(menu_selection_mark()); + lcd_putc_at(0, menu_row, menu_selection_mark()); lcd_print_pad(buffer.c, LCD_WIDTH - 2); lcd_putc(type_char); } @@ -229,10 +227,9 @@ static void menu_draw_item_select_sheet_E(char type_char, const Sheet &sheet) static void menu_draw_item_puts_E(char type_char, const Sheet &sheet) { - lcd_set_cursor(0, menu_row); SheetFormatBuffer buffer; menu_format_sheet_E(sheet, buffer); - lcd_putc(menu_selection_mark()); + lcd_putc_at(0, menu_row, menu_selection_mark()); lcd_print_pad(buffer.c, LCD_WIDTH - 2); lcd_putc(type_char); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 415642d5d..a5acccac5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -267,22 +267,18 @@ const char STR_SEPARATOR[] PROGMEM = "------------"; static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFilename) { uint8_t len = LCD_WIDTH - 1; - lcd_set_cursor(0, row); - lcd_print((lcd_encoder == menu_item)?'>':' '); + lcd_putc_at(0, row, (lcd_encoder == menu_item)?'>':' '); lcd_print_pad(longFilename, len); } static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* longFilename) { uint8_t len = LCD_WIDTH - 2; - lcd_set_cursor(0, row); - lcd_print((lcd_encoder == menu_item)?'>':' '); - lcd_print(LCD_STR_FOLDER[0]); + lcd_putc_at(0, row, (lcd_encoder == menu_item)?'>':' '); + lcd_putc(LCD_STR_FOLDER[0]); lcd_print_pad(longFilename, len); } - - #define MENU_ITEM_SDDIR(str_fn, str_fnl) do { menu_item_sddir(str_fn, str_fnl); } while (0) #define MENU_ITEM_SDFILE(str_fn, str_fnl) do { menu_item_sdfile(str_fn, str_fnl); } while (0) @@ -2935,9 +2931,8 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg) if (multi_screen) { // Display the "next screen" indicator character. lcd_set_custom_characters_nextpage(); - lcd_set_cursor(19, 3); // Display the double down arrow. - lcd_print(LCD_STR_ARROW_2_DOWN[0]); + lcd_putc_at(19, 3, LCD_STR_ARROW_2_DOWN[0]); } return multi_screen ? msgend : NULL; @@ -2969,9 +2964,8 @@ void lcd_show_fullscreen_message_and_wait_P(const char *msg) // Until confirmed by a button click. for (;;) { if (msg_next == NULL) { - lcd_set_cursor(19, 3); // Display the confirm char. - lcd_print(LCD_STR_CONFIRM[0]); + lcd_putc_at(19, 3, LCD_STR_CONFIRM[0]); } // Wait for 5 seconds before displaying the next text. for (uint8_t i = 0; i < 100; ++ i) { @@ -4785,8 +4779,7 @@ char reset_menu() { }; lcd_clear(); - lcd_set_cursor(0, 0); - lcd_putc('>'); + lcd_putc_at(0, 0, '>'); lcd_consume_click(); while (1) { @@ -5139,8 +5132,7 @@ static void lcd_rename_sheet_menu() { lcd_putc(menuData->name[i]); } - lcd_set_cursor(menuData->selected, 1); - lcd_putc('^'); + lcd_putc_at(menuData->selected, 1, '^'); if (lcd_clicked()) { if ((menuData->selected + 1u) < sizeof(Sheet::name)) From 559e1bb21a1e68147098e5876f54bb6da9ffa7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 12:43:11 +0000 Subject: [PATCH 184/240] Remove unused MMU configs - MMU_IDLER_SENSOR_ATTEMPTS_NR - MMU_REQUIRED_FW_BUILDNR These are no longer used --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 5 ----- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 5 ----- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 4 ---- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 4 ---- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 5 +---- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 5 +---- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 5 ----- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 5 ----- 8 files changed, 2 insertions(+), 36 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 9fcc29d25..555d1b405 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -503,16 +503,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning - // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 #define MMU_ERR_Y_PAUSE_POS 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 2f1f1108e..6769893df 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -504,16 +504,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning - // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 #define MMU_ERR_Y_PAUSE_POS 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index d64af4ab7..3ba4ad5eb 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -503,10 +503,7 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -518,7 +515,6 @@ // defined. //#define MMU_ALWAYS_CUT -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 8357d20c4..999ff6fb8 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -504,10 +504,7 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -519,7 +516,6 @@ // defined. //#define MMU_ALWAYS_CUT -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 1182a70e6..a9757ba0f 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -672,14 +672,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 83 +//#define MMU_FORCE_STEALTH_MODE #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 28e4842af..1e0dc6480 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -676,10 +676,8 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 83 +//#define MMU_FORCE_STEALTH_MODE #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -691,7 +689,6 @@ // defined. //#define MMU_ALWAYS_CUT -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning // MMU Error pause position #define MMU_ERR_X_PAUSE_POS 125 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 6d8f205b5..bef50bee0 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -415,13 +415,8 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 - //#define SUPPORT_VERBOSITY -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning - // Default Arc Interpolation Settings (Now configurable via M214) #define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. /* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index f43b22ccc..a1a6a6c68 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -414,13 +414,8 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 - //#define SUPPORT_VERBOSITY -#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning - // Default Arc Interpolation Settings (Now configurable via M214) #define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. /* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the From 2ed4a75894d4c608287b95c171533d4cad053edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 12:45:01 +0000 Subject: [PATCH 185/240] cleanup: remove unused settings --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 14 -------------- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 14 -------------- .../variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 14 -------------- .../variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 14 -------------- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 14 -------------- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 14 -------------- 6 files changed, 84 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 555d1b405..213c75721 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -219,20 +219,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 6769893df..d00c83d65 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -220,20 +220,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 3ba4ad5eb..561e1c3ef 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -219,20 +219,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 999ff6fb8..20d083aa3 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -220,20 +220,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index a9757ba0f..d912e6d18 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -358,20 +358,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 1e0dc6480..73b7d577b 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -362,20 +362,6 @@ #define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically #define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan - -/*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - /*------------------------------------ CHANGE FILAMENT SETTINGS *------------------------------------*/ From f5b9d2ac2e8b2ab897880244a2461a5eaa2d514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 13:09:38 +0000 Subject: [PATCH 186/240] cleanup: Remove unused Developer define --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 3 --- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 --- 8 files changed, 24 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 213c75721..f1fd2f730 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -16,9 +16,6 @@ #define FILAMENT_SIZE "1_75mm_MK25" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5" diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index d00c83d65..3cd87e2af 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -16,9 +16,6 @@ #define FILAMENT_SIZE "1_75mm_MK25" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5" diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 561e1c3ef..480f7b9b5 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -16,9 +16,6 @@ #define FILAMENT_SIZE "1_75mm_MK25S" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5S" diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 20d083aa3..387a03507 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -16,9 +16,6 @@ #define FILAMENT_SIZE "1_75mm_MK25S" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5S" diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index d912e6d18..070d63ef1 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -17,9 +17,6 @@ #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 73b7d577b..12d8971a0 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -16,9 +16,6 @@ #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S" diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index bef50bee0..3851e2220 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -15,9 +15,6 @@ GENERAL SETTINGS #define FILAMENT_SIZE "1_75mm_MK2" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2" diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index a1a6a6c68..9dc206959 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -15,9 +15,6 @@ GENERAL SETTINGS #define FILAMENT_SIZE "1_75mm_MK2" #define NOZZLE_TYPE "E3Dv6full" -// Developer flag -#define DEVELOPER - // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK2" From f6135f2ed194b43196b18d41bcd742e84cda5e2e Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 19 Nov 2022 19:47:53 +0100 Subject: [PATCH 187/240] Enable Analog IR sensor again --- Firmware/config.h | 16 ++++++---------- Firmware/temperature.cpp | 6 +++--- Firmware/temperature.h | 4 ---- Firmware/ultralcd.cpp | 25 +++++++------------------ Firmware/ultralcd.h | 2 +- 5 files changed, 17 insertions(+), 36 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index c560b13ec..b8bdc3b9e 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -5,21 +5,17 @@ #include "Configuration_var.h" #include "pins.h" -#if (defined(VOLT_IR_PIN) && defined(IR_SENSOR)) -// TODO: IR_SENSOR_ANALOG currently disabled as being incompatible with the new thermal regulation -// # define IR_SENSOR_ANALOG -#endif //ADC configuration -#ifndef IR_SENSOR_ANALOG -#define ADC_CHAN_MSK 0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9) -#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input) -#define ADC_CHAN_CNT 7 //number of used channels) -#else //!IR_SENSOR_ANALOG +#if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) #define ADC_CHAN_MSK 0b0000001101011111 //used AD channels bit mask (0,1,2,3,4,6,8,9) #define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input) #define ADC_CHAN_CNT 8 //number of used channels) -#endif //!IR_SENSOR_ANALOG +#else +#define ADC_CHAN_MSK 0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9) +#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input) +#define ADC_CHAN_CNT 7 //number of used channels) +#endif #define ADC_OVRSAMPL 16 //oversampling multiplier #define ADC_CALLBACK adc_callback //callback function () diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5dab747bd..4833e6d39 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2093,9 +2093,9 @@ void adc_callback() #ifdef VOLT_BED_PIN current_voltage_raw_bed = adc_values[ADC_PIN_IDX(VOLT_BED_PIN)]; // 6->9 #endif -#ifdef IR_SENSOR_ANALOG - current_voltage_raw_IR = adc_values[ADC_PIN_IDX(VOLT_IR_PIN)]; -#endif //IR_SENSOR_ANALOG +#if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) + fsensor.voltUpdate(adc_values[ADC_PIN_IDX(VOLT_IR_PIN)]); +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) adc_values_ready = true; } diff --git a/Firmware/temperature.h b/Firmware/temperature.h index 2a0c35fe9..cc018be0f 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -62,10 +62,6 @@ extern int current_voltage_raw_pwr; extern int current_voltage_raw_bed; #endif -#ifdef IR_SENSOR_ANALOG -extern uint16_t current_voltage_raw_IR; -#endif //IR_SENSOR_ANALOG - extern bool bedPWMDisabled; #ifdef PIDTEMP diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a53a25ba1..6804e83ac 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1410,12 +1410,12 @@ static void lcd_menu_voltages() float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; lcd_home(); lcd_printf_P(PSTR(" PWR: %4.1fV\n" " BED: %4.1fV"), volt_pwr, volt_bed); -#ifdef IR_SENSOR_ANALOG - lcd_printf_P(PSTR("\n IR : %3.1fV"), fsensor.Raw2Voltage(fsensor.getVoltRaw())); -#endif //IR_SENSOR_ANALOG +#if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) + lcd_printf_P(PSTR("\n IR : %3.1fV"), Raw2Voltage(fsensor.getVoltRaw())); +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) menu_back_if_clicked(); } -#endif //defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || defined(IR_SENSOR_ANALOG) +#endif //defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN) || (defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG)) #ifdef TMC2130 //! @brief Show Belt Status @@ -1648,7 +1648,7 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); MENU_ITEM_BACK_P(PSTR("Fil. sensor v.:")); MENU_ITEM_BACK_P(fsensor.getIRVersionText()); -#endif // IR_SENSOR_ANALOG +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) MENU_ITEM_BACK_P(STR_SEPARATOR); if (MMU2::mmu2.Enabled()) @@ -4505,7 +4505,7 @@ void lcd_hw_setup_menu(void) // can not be "static" //! Fsensor Detection isn't ready for mmu yet it is temporarily disabled. //! @todo Don't forget to remove this as soon Fsensor Detection works with mmu if(!MMU2::mmu2.Enabled()) MENU_ITEM_FUNCTION_P(PSTR("Fsensor Detection"), lcd_detect_IRsensor); -#endif //IR_SENSOR_ANALOG +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) if (_md->experimental_menu_visibility) { @@ -6010,7 +6010,7 @@ static void lcd_detect_IRsensor(){ lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILED c=20 r=4 } } -#endif //IR_SENSOR_ANALOG +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) static void lcd_selftest_v() { @@ -6236,17 +6236,6 @@ bool lcd_selftest() _progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //fil sensor OK } #endif //FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125 -#if 0 - // Intentionally disabled - that's why we moved the detection to runtime by just checking the two voltages. - // The idea is not to force the user to remove and insert the filament on an assembled printer. -//defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) - _progress = lcd_selftest_screen(TestScreen::Fsensor, _progress, 3, true, 2000); //check filament sensor - _result = lcd_selftest_IRsensor(); - if (_result) - { - _progress = lcd_selftest_screen(TestScreen::FsensorOk, _progress, 3, true, 2000); //filament sensor OK - } -#endif //IR_SENSOR_ANALOG } } #endif //FILAMENT_SENSOR diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 96ceac1fe..888f7ddd1 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -160,7 +160,7 @@ extern bool FarmOrUserECool(); #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) void printf_IRSensorAnalogBoardChange(); -#endif //IR_SENSOR_ANALOG +#endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) extern int8_t SilentModeMenu; From 01df65882f8d74feff0ee832e5bead1580941dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Apr 2023 15:09:11 +0000 Subject: [PATCH 188/240] cleanup: remove commented code --- Firmware/Marlin_main.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a124c9be0..a97d727d7 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1595,15 +1595,6 @@ void setup() #ifdef UVLO_SUPPORT if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO -/* - if (!lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false)) recover_print(); - else { - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); - lcd_update_enable(true); - lcd_update(2); - lcd_setstatuspgm(MSG_WELCOME); - } -*/ manage_heater(); // Update temperatures #ifdef DEBUG_UVLO_AUTOMATIC_RECOVER printf_P(_N("Power panic detected!\nCurrent bed temp:%d\nSaved bed temp:%d\n"), (int)degBed(), eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED)); From 4b54cd1f302e6c94a0899cd4e300e51cd6c5568a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Apr 2023 15:38:06 +0000 Subject: [PATCH 189/240] Remove unused LoadingToNozzleRAII The variable is not used anywhere. Change in memory: Flash: -14 bytes SRAM: -1 byte --- Firmware/mmu2.cpp | 14 -------------- Firmware/mmu2.h | 4 ---- 2 files changed, 18 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index e047643ef..91c3c81fa 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -49,7 +49,6 @@ MMU2::MMU2() , mmu_print_saved(SavedState::None) , loadFilamentStarted(false) , unloadFilamentStarted(false) - , loadingToNozzle(false) , toolchange_counter(0) , tmcFailures(0) { } @@ -534,23 +533,10 @@ bool MMU2::load_filament(uint8_t slot) { return true; } -struct LoadingToNozzleRAII { - MMU2 &mmu2; - explicit inline LoadingToNozzleRAII(MMU2 &mmu2) - : mmu2(mmu2) { - mmu2.loadingToNozzle = true; - } - inline ~LoadingToNozzleRAII() { - mmu2.loadingToNozzle = false; - } -}; - bool MMU2::load_filament_to_nozzle(uint8_t slot) { if (!WaitForMMUReady()) return false; - LoadingToNozzleRAII ln(*this); - WaitForHotendTargetTempBeep(); FullScreenMsgLoad(slot); diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index f21fe614e..e85246524 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -307,10 +307,6 @@ private: bool loadFilamentStarted; bool unloadFilamentStarted; - friend struct LoadingToNozzleRAII; - /// true in case we are doing the LoadToNozzle operation - that means the filament shall be loaded all the way down to the nozzle - /// unlike the mid-print ToolChange commands, which only load the first ~30mm and then the G-code takes over. - bool loadingToNozzle; uint16_t toolchange_counter; uint16_t tmcFailures; }; From 43d41ddd2b628ad556e6ef805dc813345e0f562a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Apr 2023 23:23:31 +0000 Subject: [PATCH 190/240] cleanup: static variables in Marlin_main.cpp --- Firmware/Marlin.h | 5 ----- Firmware/Marlin_main.cpp | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 9628219e3..d198d406f 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -304,8 +304,6 @@ extern float retract_length_swap; extern float retract_recover_length_swap; #endif -extern uint8_t host_keepalive_interval; - extern uint32_t starttime; // milliseconds extern uint32_t pause_time; // milliseconds extern uint32_t start_pause_print; // milliseconds @@ -350,9 +348,6 @@ extern uint16_t print_time_to_change_silent; #define PRINT_TIME_REMAINING_INIT 0xffff -extern uint16_t mcode_in_progress; -extern uint16_t gcode_in_progress; - extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d41b2d3bf..f380913ed 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -248,7 +248,7 @@ static bool cancel_heatup = false; int8_t busy_state = NOT_BUSY; static long prev_busy_signal_ms = -1; -uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; +static uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; @@ -258,9 +258,9 @@ const char echomagic[] PROGMEM = "echo:"; #define X_COORD_INVALID (X_MIN_POS-1) #define SAVED_START_POSITION_UNSET X_COORD_INVALID -float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; +static float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; -uint16_t saved_segment_idx = 0; +static uint16_t saved_segment_idx = 0; // storing estimated time to end of print counted by slicer uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; @@ -292,16 +292,16 @@ static float next_feedrate; // Original feedrate saved during homing moves static float saved_feedrate; -const int8_t sensitive_pins[] PROGMEM = SENSITIVE_PINS; // Sensitive pin list for M42 +static const int8_t sensitive_pins[] PROGMEM = SENSITIVE_PINS; // Sensitive pin list for M42 //static float tt = 0; //static float bt = 0; //Inactivity shutdown variables static LongTimer previous_millis_cmd; -unsigned long max_inactive_time = 0; -static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; -static unsigned long safetytimer_inactive_time = DEFAULT_SAFETYTIMER_TIME_MINS*60*1000ul; +static uint32_t max_inactive_time = 0; +static uint32_t stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; +static uint32_t safetytimer_inactive_time = DEFAULT_SAFETYTIMER_TIME_MINS*60*1000ul; uint32_t starttime; uint32_t pause_time; @@ -315,12 +315,12 @@ bool processing_tcode; // Helper variable to block certain functions while T-cod Servo servos[NUM_SERVOS]; #endif -bool target_direction; +static bool target_direction; //Insert variables if CHDK is defined #ifdef CHDK -unsigned long chdkHigh = 0; -bool chdkActive = false; +static uint32_t chdkHigh = 0; +static bool chdkActive = false; #endif //! @name RAM save/restore printing @@ -410,8 +410,8 @@ static void temp_compensation_apply(); static uint8_t get_PRUSA_SN(char* SN); #endif //PRUSA_SN_SUPPORT -uint16_t gcode_in_progress = 0; -uint16_t mcode_in_progress = 0; +static uint16_t gcode_in_progress = 0; +static uint16_t mcode_in_progress = 0; void serial_echopair_P(const char *s_P, float v) { serialprintPGM(s_P); SERIAL_ECHO(v); } From b67063f14a164848391370f12acbc5dd4b1efc33 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 17 Apr 2023 21:10:20 +0200 Subject: [PATCH 191/240] Remove empty lines --- Firmware/Marlin_main.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f380913ed..8ea7f0d06 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -187,8 +187,6 @@ bool loading_flag = false; #define XY_NO_RESTORE_FLAG (mesh_bed_leveling_flag || homing_flag) - - int fan_edge_counter[2]; int fan_speed[2]; From ea97ca7920a800f21446c9798769c1eb2c0126ac Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 17 Apr 2023 21:12:59 +0200 Subject: [PATCH 192/240] Use `EXTRUDERS` instead of hardcoded value in string --- Firmware/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8ea7f0d06..cbf2f7405 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6463,7 +6463,7 @@ Sigma_Exit: SERIAL_ECHOPGM(PROTOCOL_VERSION); SERIAL_ECHOPGM(" MACHINE_TYPE:"); SERIAL_ECHOPGM(CUSTOM_MENDEL_NAME); - SERIAL_ECHOPGM(" EXTRUDER_COUNT:1"); + SERIAL_ECHOPGM(" EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS)); SERIAL_ECHOPGM(" UUID:"); SERIAL_ECHOLNPGM(MACHINE_UUID); #ifdef EXTENDED_CAPABILITIES_REPORT From 18c389543ba5386e22d76460af1ab6bb76fde0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Apr 2023 21:31:12 +0000 Subject: [PATCH 193/240] Fix lcd_update() FW crashes Change in memory: Flash: +10 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 3 +++ Firmware/lcd.cpp | 12 ++++++------ Firmware/lcd.h | 4 ++++ Firmware/ultralcd.cpp | 9 ++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6cadd41a2..86066273c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9437,6 +9437,9 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s check_axes_activity(); MMU2::mmu2.mmu_loop(); + lcd_knob_update(); + backlight_update(); + // handle longpress if(lcd_longpress_trigger) { diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index bec189d1b..0cbd5ac2b 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -690,11 +690,7 @@ void lcd_quick_feedback(void) lcd_beeper_quick_feedback(); } -void lcd_update(uint8_t lcdDrawUpdateOverride) -{ - if (lcd_draw_update < lcdDrawUpdateOverride) - lcd_draw_update = lcdDrawUpdateOverride; - +void lcd_knob_update() { if (lcd_backlight_wake_trigger) { lcd_backlight_wake_trigger = false; backlight_wake(); @@ -711,8 +707,12 @@ void lcd_update(uint8_t lcdDrawUpdateOverride) lcd_draw_update = 1; } } +} - backlight_update(); +void lcd_update(uint8_t lcdDrawUpdateOverride) +{ + if (lcd_draw_update < lcdDrawUpdateOverride) + lcd_draw_update = lcdDrawUpdateOverride; if (!lcd_update_enabled) return; diff --git a/Firmware/lcd.h b/Firmware/lcd.h index eee69e97d..aedfc38d3 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -123,6 +123,10 @@ extern void lcd_beeper_quick_feedback(void); //Cause an LCD refresh, and give the user visual or audible feedback that something has happened extern void lcd_quick_feedback(void); +/// @brief Check whether knob is rotated or clicked and update relevant +///variables. Flags are set by lcd_buttons_update in ISR context. +extern void lcd_knob_update(); + extern void lcd_update(uint8_t lcdDrawUpdateOverride); extern void lcd_update_enable(uint8_t enabled); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c21c555fd..18ac7cdf4 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2208,7 +2208,8 @@ uint8_t lcd_alright() { lcd_consume_click(); while (1) { - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { @@ -4696,7 +4697,8 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite KEEPALIVE_STATE(PAUSED_FOR_USER); while (1) { - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { @@ -4787,7 +4789,8 @@ char reset_menu() { lcd_puts_at_P(1, i, item[first + i]); } - delay_keep_alive(0); + manage_heater(); + manage_inactivity(true); if (lcd_encoder) { if (lcd_encoder < 0) { From 2ad916a2c3b0ea35097e4e2c6d9419e9d6332a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 10:59:58 +0000 Subject: [PATCH 194/240] Fix manual fan check menu lcd_encoder was not being updated we need to call manage_inactivity Tested on MK3S+ Change in memory: Flash: +6 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 18ac7cdf4..4f75d0930 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6909,6 +6909,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, manage_heater(); + manage_inactivity(true); _delay(100); } while (!lcd_clicked()); From 91b913e997783279177fb57ae8dfb0d13f69a005 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 21 Apr 2023 12:59:40 +0200 Subject: [PATCH 195/240] Fix `M0` click not consumed Fix the need to click the knob twice to dismiss `M0`. Flash: -54B SRAM: -2B --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/menu.h | 4 +++- Firmware/ultralcd.cpp | 36 ++---------------------------------- Firmware/ultralcd.h | 1 - 4 files changed, 7 insertions(+), 38 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6cadd41a2..8a8dc0a51 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5244,8 +5244,8 @@ void process_commands() custom_message_type = CustomMsg::Status; // let the lcd display the name of the printed G-code file in farm mode } } - lcd_ignore_click(); //call lcd_ignore_click also for else ??? st_synchronize(); + menu_set_block(MENU_BLOCK_STATUS_SCREEN_M0); previous_millis_cmd.start(); if (codenum > 0 ) { codenum += _millis(); // keep track of when we started waiting @@ -5254,10 +5254,10 @@ void process_commands() delay_keep_alive(0); } KEEPALIVE_STATE(IN_HANDLER); - lcd_ignore_click(false); } else { marlin_wait_for_click(); } + menu_unset_block(MENU_BLOCK_STATUS_SCREEN_M0); if (IS_SD_PRINTING) custom_message_type = CustomMsg::Status; else diff --git a/Firmware/menu.h b/Firmware/menu.h index 0735bcd5e..ba634a468 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -38,6 +38,7 @@ enum ESeriousErrors { #ifdef TEMP_MODEL MENU_BLOCK_TEMP_MODEL_AUTOTUNE = 0x02, #endif + MENU_BLOCK_STATUS_SCREEN_M0 = 0x04, }; // and possibly others in the future. //! this is a flag for disabling entering the main menu and longpress. If this is set to anything != @@ -49,7 +50,8 @@ extern uint8_t menu_block_mask; //! a c++ class would have been better #define menu_set_block(x) menu_block_mask |= x; #define menu_unset_block(x) menu_block_mask &= ~x; -#define menu_is_blocked(x) (menu_block_mask & x) != 0 +#define menu_is_blocked(x) (menu_block_mask & x) +#define menu_is_any_block() (menu_block_mask != MENU_BLOCK_NONE) extern uint8_t menu_line; extern uint8_t menu_item; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c21c555fd..3515e8383 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -98,7 +98,6 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg) // void copy_and_scalePID_d(); /* Different menus */ -//static void lcd_status_screen(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") #if (LANG_MODE != 0) static void lcd_language_menu(); #endif @@ -256,9 +255,6 @@ bool lcd_oldcardstatus; uint8_t selected_sheet = 0; -bool ignore_click = false; -bool wait_for_unclick; - bool bMain; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function bool bSettings; // flag (i.e. 'fake parameter') for 'lcd_hw_setup_menu()' function @@ -757,29 +753,7 @@ void lcd_status_screen() // NOT static due to using ins lcd_commands(); } - bool current_click = lcd_clicked(); - - if (ignore_click) - { - if (wait_for_unclick) - { - if (!current_click) - ignore_click = wait_for_unclick = false; - else - current_click = false; - } - else if (current_click) - { - lcd_draw_update = 2; - wait_for_unclick = true; - current_click = false; - } - } - - if (current_click - && ( menu_block_mask == MENU_BLOCK_NONE ) // or a serious error blocks entering the menu - ) - { + if (!menu_is_any_block() && lcd_clicked()) { menu_depth = 0; //redundant, as already done in lcd_return_to_status(), just to be sure menu_submenu(lcd_main_menu); lcd_refresh(); // to maybe revive the LCD if static electricity killed it. @@ -7212,12 +7186,6 @@ void ultralcd_init() strncpy_P(lcd_status_message, MSG_WELCOME, LCD_WIDTH); } -void lcd_ignore_click(bool b) -{ - ignore_click = b; - wait_for_unclick = false; -} - static bool lcd_message_check(uint8_t priority) { // regular priority check @@ -7314,7 +7282,7 @@ void menu_lcd_longpress_func(void) // Wake up the LCD backlight and, // start LCD inactivity timer lcd_timeoutToStatus.start(); - if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z || menu_block_mask != MENU_BLOCK_NONE || Stopped) + if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z || menu_is_any_block() || Stopped) { // disable longpress during re-entry, while homing, calibration or if a serious error lcd_draw_update = 2; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index ceb75a1b3..d9ef0ba81 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -168,7 +168,6 @@ extern bool isPrintPaused; extern uint8_t scrollstuff; -void lcd_ignore_click(bool b=true); void lcd_commands(); From 4ce3fa53a18dc3ffd8f906dc91b99d5f4b4c799c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 17:42:55 +0000 Subject: [PATCH 196/240] Optimise M0/M1 code size Replace two bool variables with one. It's not obvious but (!hasP && !hasS) is equal to !(hasP || hasS) Note: expiration_time_set = hasP || hasS Truth table: |--------------------------------------------------| | hasP| hasS| (!hasP && !hasS)| !(hasP || hasS) | |------|-----|--------------------|-----------------| | 0 | 0 | 1 | 1 | | 0 | 1 | 0 | 0 | | 1 | 0 | 0 | 0 | | 1 | 1 | 0 | 0 | |--------------------------------------------------| Change in memory: Flash: -36 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8a8dc0a51..6b6c662f1 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5221,18 +5221,13 @@ void process_commands() case 1: { const char *src = strchr_pointer + 2; codenum = 0; - bool hasP = false, hasS = false; - if (code_seen('P')) { - codenum = code_value_long(); // milliseconds to wait - hasP = codenum > 0; - } - if (code_seen('S')) { - codenum = code_value_long() * 1000; // seconds to wait - hasS = codenum > 0; - } + if (code_seen('P')) codenum = code_value_long(); // milliseconds to wait + if (code_seen('S')) codenum = code_value_long() * 1000; // seconds to wait + bool expiration_time_set = bool(codenum); + while (*src == ' ') ++src; custom_message_type = CustomMsg::M0Wait; - if (!hasP && !hasS && *src != '\0') { + if (!expiration_time_set && *src != '\0') { lcd_setstatus(src); } else { // farmers want to abuse a bug from the previous firmware releases @@ -5247,7 +5242,7 @@ void process_commands() st_synchronize(); menu_set_block(MENU_BLOCK_STATUS_SCREEN_M0); previous_millis_cmd.start(); - if (codenum > 0 ) { + if (expiration_time_set) { codenum += _millis(); // keep track of when we started waiting KEEPALIVE_STATE(PAUSED_FOR_USER); while(_millis() < codenum && !lcd_clicked()) { From ccabf1fa31a9db95bd11ad904fbbd8f84f77ea3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Apr 2023 13:39:08 +0000 Subject: [PATCH 197/240] Remove random //-// comments --- Firmware/Configuration.h | 1 - Firmware/Marlin_main.cpp | 1 - Firmware/lcd.cpp | 14 ++------------ Firmware/temperature.cpp | 21 +-------------------- Firmware/ultralcd.cpp | 7 ++----- Firmware/util.h | 2 -- 6 files changed, 5 insertions(+), 41 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index f308413cd..1ea8c4e91 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -6,7 +6,6 @@ #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) -//-// #include extern const uint16_t _nPrinterType; extern const char _sPrinterName[] PROGMEM; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 86066273c..d138196fa 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -43,7 +43,6 @@ * */ -//-// #include "Configuration.h" #include "Marlin.h" #include "config.h" diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 0cbd5ac2b..2fe042588 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -13,7 +13,6 @@ #include #include "Marlin.h" #include "fastio.h" -//-// #include "sound.h" #include "backlight.h" @@ -671,17 +670,8 @@ uint8_t lcd_clicked(void) return clicked; } -void lcd_beeper_quick_feedback(void) -{ -//-// -Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); -/* - for(int8_t i = 0; i < 10; i++) - { - Sound_MakeCustom(100,0,false); - _delay_us(100); - } -*/ +void lcd_beeper_quick_feedback(void) { + Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); } void lcd_quick_feedback(void) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index c0378fe65..58e6d1e6f 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -944,17 +944,6 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl __preheat_counter[_heater_id]++; if (__preheat_counter[_heater_id] > ((_isbed) ? 16 : 8)) // periodicaly check if current temperature changes { - /*SERIAL_ECHOPGM("Heater:"); - MYSERIAL.print(_heater_id); - SERIAL_ECHOPGM(" T:"); - MYSERIAL.print(_current_temperature); - SERIAL_ECHOPGM(" Tstart:"); - MYSERIAL.print(__preheat_start[_heater_id]); - SERIAL_ECHOPGM(" delta:"); - MYSERIAL.print(_current_temperature-__preheat_start[_heater_id]);*/ - -//-// if (_current_temperature - __preheat_start[_heater_id] < 2) { -//-// if (_current_temperature - __preheat_start[_heater_id] < ((_isbed && (_current_temperature>105.0))?0.6:2.0)) { __delta=2.0; if(_isbed) { @@ -964,11 +953,7 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl } if (_current_temperature - __preheat_start[_heater_id] < __delta) { __preheat_errors[_heater_id]++; - /*SERIAL_ECHOPGM(" Preheat errors:"); - MYSERIAL.println(__preheat_errors[_heater_id]);*/ - } - else { - //SERIAL_ECHOLNPGM(""); + } else { __preheat_errors[_heater_id] = 0; } @@ -980,12 +965,8 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl } } -//-// if (_current_temperature >= _target_temperature && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) if ((_current_temperature > (_target_temperature - __hysteresis)) && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) { - /*SERIAL_ECHOPGM("Heater:"); - MYSERIAL.print(_heater_id); - MYSERIAL.println(" ->tempRunaway");*/ temp_runaway_status[_heater_id] = TempRunaway_ACTIVE; temp_runaway_check_active = false; temp_runaway_error_counter[_heater_id] = 0; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index aa7f41ee0..bb6dde76b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3392,10 +3392,8 @@ static void lcd_crash_mode_info2() } #endif //TMC2130 -//-// -static void lcd_sound_state_set(void) -{ -Sound_CycleState(); +static void lcd_sound_state_set(void) { + Sound_CycleState(); } #ifndef MMU_FORCE_STEALTH_MODE @@ -4263,7 +4261,6 @@ do\ }\ while (0) -//-// static void lcd_check_mode_set(void) { switch(oCheckMode) diff --git a/Firmware/util.h b/Firmware/util.h index 4c947760c..20f03388b 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -21,8 +21,6 @@ bool show_upgrade_dialog_if_version_newer(const char *version_string); bool eeprom_fw_version_older_than_p(const uint16_t (&req_ver)[4]); void update_current_firmware_version_to_eeprom(); - -//-// #define EEPROM_NOZZLE_DIAMETER_uM_DEFAULT 400 enum class ClPrintChecking:uint_least8_t From b6e228d5a568152881711e965e2dc9f91583876b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 09:34:25 +0000 Subject: [PATCH 198/240] Fix double feedback in First Layer Calibration For MMU users: This happens when the user selects a filament to load from 1 to 5 For non-MMU: this happens when clicking the knob within 2 seconds. Additionally fixed the code indendation it was a mix of spaces and tabs --- Firmware/ultralcd.cpp | 61 ++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5b4f4dc86..647d74ab5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3607,46 +3607,38 @@ void lcd_first_layer_calibration_reset() } -void lcd_v2_calibration() -{ - if (MMU2::mmu2.Enabled()) - { - const uint8_t filament = choose_menu_P( - _T(MSG_SELECT_FILAMENT), - _T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off - if (filament < 5) - { - lay1cal_filament = filament; - } - else - { - menu_back(); - return; - } +void lcd_v2_calibration() { + if (MMU2::mmu2.Enabled()) { + const uint8_t filament = choose_menu_P( + _T(MSG_SELECT_FILAMENT), + _T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off + if (filament < MMU_FILAMENT_COUNT) { + lay1cal_filament = filament; + } else { + menu_back(); + return; + } } #ifdef FILAMENT_SENSOR else if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { - bool loaded = false; - if (fsensor.isReady()) - { - loaded = fsensor.getFilamentPresent(); - } - else - { - loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, LCD_MIDDLE_BUTTON_CHOICE); - lcd_update_enabled = true; + bool loaded = false; + if (fsensor.isReady()) { + loaded = fsensor.getFilamentPresent(); + } else { + loaded = !lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, LCD_MIDDLE_BUTTON_CHOICE); + lcd_update_enabled = true; + } - } - - - if (!loaded) - { + if (!loaded) { lcd_display_message_fullscreen_P(_i("Please load filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_consume_click(); for (uint_least8_t i = 0; i < 20; i++) { //wait max. 2s delay_keep_alive(100); - if (lcd_clicked()) { + if (LCD_CLICKED) { + // Click event is consumed below when + // rendering the preheat menu. We use this + // to check whether a audio feedback should be shown break; } } @@ -3658,7 +3650,12 @@ void lcd_v2_calibration() #endif //FILAMENT_SENSOR eFilamentAction = FilamentAction::Lay1Cal; - menu_goto(lcd_generic_preheat_menu, 0, true, true); + + // Produce feedback if the LCD knob was not clicked + // Note for non-MMU setups there is a 2 second timeout in case + // the user does not click the knob, in such a case we want feedback + // since the firmware is changing the menu silently. + menu_goto(lcd_generic_preheat_menu, 0, true, !lcd_clicked()); } void lcd_wizard() { From b8f8348e77ca221e124cf64b6ee8c3d33bcef01e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 09:34:52 +0000 Subject: [PATCH 199/240] Fix double feedback in Z-offset menu --- Firmware/ultralcd.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 647d74ab5..4cf991ec2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3575,7 +3575,7 @@ void lcd_first_layer_calibration_reset() static_assert(sizeof(menu_data)>= sizeof(MenuData),"_menu_data_t doesn't fit into menu_data"); MenuData* menuData = (MenuData*)&(menu_data[0]); - if(lcd_clicked() || !eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) || + if(LCD_CLICKED || !eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) || (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) || (0 == static_cast(eeprom_read_word(reinterpret_cast (&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset))))) @@ -3584,7 +3584,11 @@ void lcd_first_layer_calibration_reset() { eeprom_update_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset), 0xffff); } - menu_goto(lcd_v2_calibration, 0, true, true); + + // If the knob was clicked, don't produce feedback + // It should only be done when the firmware changes the menu + // on its own (silently) + menu_goto(lcd_v2_calibration, 0, true, !lcd_clicked()); } if (lcd_encoder > 0) From 76a76de7eaa391d0eacc8d7c6a6b65e5eeefb42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Apr 2023 13:46:03 +0000 Subject: [PATCH 200/240] Rewrite the Tcodes description The old description had typos and was a bit confusing for new users The new text is a suggestion from David Buzek at Prusa Research --- Firmware/Marlin_main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 86066273c..bbd4f246d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8628,13 +8628,13 @@ Sigma_Exit: // end if(code_seen('M')) (end of M codes) /*! ----------------------------------------------------------------------------------------- - # T Codes - T - select extruder in case of multi extruder printer. select filament in case of MMU_V2. - #### For MMU_V2: - T Gcode to extrude at least 38.10 mm at feedrate 19.02 mm/s must follow immediately to load to extruder wheels. - @n T? Gcode to extrude shouldn't have to follow, load to extruder wheels is done automatically - @n Tx Same as T?, except nozzle doesn't have to be preheated. Tc must be placed after extruder nozzle is preheated to finish filament load. - @n Tc Load to nozzle after filament was prepared by Tc and extruder nozzle is already heated. + T - select extruder in case of multi extruder printer. Selects filament position 1-5 (T0-T4) in case of MMU. + + For MMU2/S / MMU3: + T - Selects the filament position. A Gcode to load a filament to the nozzle must follow. + Tx - Printer asks user to select a filament position. Then loads the filament from the MMU unit into the extruder wheels only. G-code to heat up the nozzle follows. + Tc - Loads the filament tip from the extruder wheels into the nozzle. + T? - acts the same as Tx followed by Tc */ else if(*CMDBUFFER_CURRENT_STRING == 'T') { strchr_pointer = CMDBUFFER_CURRENT_STRING; From 4935191335cd4f30db9e9dd82c535c3c4449a583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 18:43:21 +0000 Subject: [PATCH 201/240] Cleanup remove unused macros enable_e1 enable_e2 disable_e1 disable_e2 The firmware doesn't support multiple extruders No change in memory --- Firmware/Marlin.h | 32 -------------------------------- Firmware/Marlin_main.cpp | 22 ++++------------------ Firmware/planner.cpp | 7 +------ Firmware/ultralcd.cpp | 4 ---- 4 files changed, 5 insertions(+), 60 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index d198d406f..c05a27261 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -181,21 +181,6 @@ void manage_inactivity(bool ignore_stepper_queue=false); #define disable_z() disable_force_z() #endif // PSU_Delta - -//#if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1 -//#ifdef Z_DUAL_STEPPER_DRIVERS -//#define enable_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); } -//#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } -//#else -//#define enable_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON) -//#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } -//#endif -//#else -//#define enable_z() ; -//#define disable_z() ; -//#endif - - #if defined(E0_ENABLE_PIN) && (E0_ENABLE_PIN > -1) #define enable_e0() WRITE(E0_ENABLE_PIN, E_ENABLE_ON) #define disable_e0() WRITE(E0_ENABLE_PIN,!E_ENABLE_ON) @@ -204,23 +189,6 @@ void manage_inactivity(bool ignore_stepper_queue=false); #define disable_e0() /* nothing */ #endif -#if (EXTRUDERS > 1) && defined(E1_ENABLE_PIN) && (E1_ENABLE_PIN > -1) - #define enable_e1() WRITE(E1_ENABLE_PIN, E_ENABLE_ON) - #define disable_e1() WRITE(E1_ENABLE_PIN,!E_ENABLE_ON) -#else - #define enable_e1() /* nothing */ - #define disable_e1() /* nothing */ -#endif - -#if (EXTRUDERS > 2) && defined(E2_ENABLE_PIN) && (E2_ENABLE_PIN > -1) - #define enable_e2() WRITE(E2_ENABLE_PIN, E_ENABLE_ON) - #define disable_e2() WRITE(E2_ENABLE_PIN,!E_ENABLE_ON) -#else - #define enable_e2() /* nothing */ - #define disable_e2() /* nothing */ -#endif - - enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5}; #define X_AXIS_MASK 1 #define Y_AXIS_MASK 2 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0bdd2b4a5..67e8e86a8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5269,8 +5269,6 @@ void process_commands() enable_y(); enable_z(); enable_e0(); - enable_e1(); - enable_e2(); break; #ifdef SDSUPPORT @@ -6275,22 +6273,16 @@ Sigma_Exit: { st_synchronize(); disable_e0(); - disable_e1(); - disable_e2(); finishAndDisableSteppers(); } else { st_synchronize(); - if (code_seen('X')) disable_x(); - if (code_seen('Y')) disable_y(); - if (code_seen('Z')) disable_z(); + if (code_seen('X')) disable_x(); + if (code_seen('Y')) disable_y(); + if (code_seen('Z')) disable_z(); #if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS - if (code_seen('E')) { - disable_e0(); - disable_e1(); - disable_e2(); - } + if (code_seen('E')) disable_e0(); #endif } } @@ -9370,8 +9362,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); } } } @@ -9459,8 +9449,6 @@ void kill(const char *full_screen_message) { disable_y(); poweroff_z(); disable_e0(); - disable_e1(); - disable_e2(); SERIAL_ERROR_START; SERIAL_ERRORLNRPGM(PSTR("Printer halted. kill() called!")); @@ -9571,8 +9559,6 @@ void finishAndDisableSteppers() disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); #ifndef LA_NOCOMPAT // Steppers are disabled both when a print is stopped and also via M84 (which is additionally diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 46b679793..001b2137b 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -554,12 +554,7 @@ void check_axes_activity() if((DISABLE_X) && (x_active == 0)) disable_x(); if((DISABLE_Y) && (y_active == 0)) disable_y(); if((DISABLE_Z) && (z_active == 0)) disable_z(); - if((DISABLE_E) && (e_active == 0)) - { - disable_e0(); - disable_e1(); - disable_e2(); - } + if((DISABLE_E) && (e_active == 0)) disable_e0(); #if defined(FAN_PIN) && FAN_PIN > -1 #ifdef FAN_KICKSTART_TIME static unsigned long fan_kick_end; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 62eb16971..83239aa9d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3188,8 +3188,6 @@ void lcd_temp_cal_show_result(bool result) { disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); setTargetBed(0); //set bed target temperature back to 0 // Store boolean result @@ -4947,8 +4945,6 @@ void unload_filament(float unloadLength) //disable extruder steppers so filament can be removed disable_e0(); - disable_e1(); - disable_e2(); _delay(100); Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); From f539b406113eba44470b4a2bfeb446b9b243c358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 18:55:25 +0000 Subject: [PATCH 202/240] Remove more EXTRUDERS > 1 code --- Firmware/temperature.cpp | 159 +-------------------------------------- 1 file changed, 4 insertions(+), 155 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 58e6d1e6f..06b455bd4 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -797,48 +797,6 @@ void soft_pwm_init() } #endif //MAXTEMP -#if (EXTRUDERS > 1) && defined(HEATER_1_MINTEMP) - minttemp[1] = HEATER_1_MINTEMP; - while(analog2temp(minttemp_raw[1], 1) < HEATER_1_MINTEMP) { -#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP - minttemp_raw[1] += OVERSAMPLENR; -#else - minttemp_raw[1] -= OVERSAMPLENR; -#endif - } -#endif // MINTEMP 1 -#if (EXTRUDERS > 1) && defined(HEATER_1_MAXTEMP) - maxttemp[1] = HEATER_1_MAXTEMP; - while(analog2temp(maxttemp_raw[1], 1) > HEATER_1_MAXTEMP) { -#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP - maxttemp_raw[1] -= OVERSAMPLENR; -#else - maxttemp_raw[1] += OVERSAMPLENR; -#endif - } -#endif //MAXTEMP 1 - -#if (EXTRUDERS > 2) && defined(HEATER_2_MINTEMP) - minttemp[2] = HEATER_2_MINTEMP; - while(analog2temp(minttemp_raw[2], 2) < HEATER_2_MINTEMP) { -#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP - minttemp_raw[2] += OVERSAMPLENR; -#else - minttemp_raw[2] -= OVERSAMPLENR; -#endif - } -#endif //MINTEMP 2 -#if (EXTRUDERS > 2) && defined(HEATER_2_MAXTEMP) - maxttemp[2] = HEATER_2_MAXTEMP; - while(analog2temp(maxttemp_raw[2], 2) > HEATER_2_MAXTEMP) { -#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP - maxttemp_raw[2] -= OVERSAMPLENR; -#else - maxttemp_raw[2] += OVERSAMPLENR; -#endif - } -#endif //MAXTEMP 2 - #ifdef BED_MINTEMP while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) { #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP @@ -1228,14 +1186,6 @@ FORCE_INLINE static void soft_pwm_core() WRITE(HEATER_1_PIN,1); #endif } else WRITE(HEATER_0_PIN,0); -#if EXTRUDERS > 1 - soft_pwm_1 = soft_pwm[1]; - if(soft_pwm_1 > 0) WRITE(HEATER_1_PIN,1); else WRITE(HEATER_1_PIN,0); -#endif -#if EXTRUDERS > 2 - soft_pwm_2 = soft_pwm[2]; - if(soft_pwm_2 > 0) WRITE(HEATER_2_PIN,1); else WRITE(HEATER_2_PIN,0); -#endif } #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 @@ -1272,13 +1222,6 @@ FORCE_INLINE static void soft_pwm_core() #endif } -#if EXTRUDERS > 1 - if(soft_pwm_1 < pwm_count) WRITE(HEATER_1_PIN,0); -#endif -#if EXTRUDERS > 2 - if(soft_pwm_2 < pwm_count) WRITE(HEATER_2_PIN,0); -#endif - #if 0 // @@DR #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 if (soft_pwm_b < (pwm_count & ((1 << HEATER_BED_SOFT_PWM_BITS) - 1))){ @@ -1333,59 +1276,7 @@ FORCE_INLINE static void soft_pwm_core() #endif } } - -#if EXTRUDERS > 1 - // EXTRUDER 1 - soft_pwm_1 = soft_pwm[1]; - if (soft_pwm_1 > 0) { - // turn ON heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 0) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 1; - WRITE(HEATER_1_PIN, 1); - } - } else { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 1) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 0; - WRITE(HEATER_1_PIN, 0); - } - } -#endif - -#if EXTRUDERS > 2 - // EXTRUDER 2 - soft_pwm_2 = soft_pwm[2]; - if (soft_pwm_2 > 0) { - // turn ON heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 0) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 1; - WRITE(HEATER_2_PIN, 1); - } - } else { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 1) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 0; - WRITE(HEATER_2_PIN, 0); - } - } -#endif - + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // BED soft_pwm_b = soft_pwm_bed; @@ -1428,37 +1319,7 @@ FORCE_INLINE static void soft_pwm_core() #endif } } - -#if EXTRUDERS > 1 - // EXTRUDER 1 - if (soft_pwm_1 < slow_pwm_count) { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 1) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 0; - WRITE(HEATER_1_PIN, 0); - } - } -#endif - -#if EXTRUDERS > 2 - // EXTRUDER 2 - if (soft_pwm_2 < slow_pwm_count) { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 1) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 0; - WRITE(HEATER_2_PIN, 0); - } - } -#endif - + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // BED if (soft_pwm_b < slow_pwm_count) { @@ -1493,20 +1354,8 @@ FORCE_INLINE static void soft_pwm_core() // Extruder 0 if (state_timer_heater_0 > 0) { state_timer_heater_0--; - } - -#if EXTRUDERS > 1 - // Extruder 1 - if (state_timer_heater_1 > 0) - state_timer_heater_1--; -#endif - -#if EXTRUDERS > 2 - // Extruder 2 - if (state_timer_heater_2 > 0) - state_timer_heater_2--; -#endif - + } + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // Bed if (state_timer_heater_b > 0) From fcabcd28044574ae53d9e1ff2e97123cc4e25a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 19:26:47 +0000 Subject: [PATCH 203/240] Remove TEMP_SENSOR_1 and TEMP_SENSOR_2 Hopefully I didn't miss anything --- Firmware/Configuration_adv.h | 22 ---- Firmware/temperature.cpp | 24 ++--- Firmware/thermistortables.h | 102 +++++------------- Firmware/ultralcd.cpp | 6 -- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 6 -- .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 6 -- .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 6 -- .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 6 -- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 6 -- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 6 -- .../obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 6 -- .../obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 6 -- 12 files changed, 32 insertions(+), 170 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index d115e558d..aa663228d 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -453,14 +453,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define THERMISTORHEATER_0 TEMP_SENSOR_0 #define HEATER_0_USES_THERMISTOR #endif -#if TEMP_SENSOR_1 > 0 - #define THERMISTORHEATER_1 TEMP_SENSOR_1 - #define HEATER_1_USES_THERMISTOR -#endif -#if TEMP_SENSOR_2 > 0 - #define THERMISTORHEATER_2 TEMP_SENSOR_2 - #define HEATER_2_USES_THERMISTOR -#endif #if TEMP_SENSOR_BED > 0 #define THERMISTORBED TEMP_SENSOR_BED #define BED_USES_THERMISTOR @@ -474,12 +466,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #if TEMP_SENSOR_0 == -1 #define HEATER_0_USES_AD595 #endif -#if TEMP_SENSOR_1 == -1 - #define HEATER_1_USES_AD595 -#endif -#if TEMP_SENSOR_2 == -1 - #define HEATER_2_USES_AD595 -#endif #if TEMP_SENSOR_BED == -1 #define BED_USES_AD595 #endif @@ -490,14 +476,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #undef HEATER_0_MINTEMP #undef HEATER_0_MAXTEMP #endif -#if TEMP_SENSOR_1 == 0 - #undef HEATER_1_MINTEMP - #undef HEATER_1_MAXTEMP -#endif -#if TEMP_SENSOR_2 == 0 - #undef HEATER_2_MINTEMP - #undef HEATER_2_MAXTEMP -#endif #if TEMP_SENSOR_BED == 0 #undef BED_MINTEMP #undef BED_MAXTEMP diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 06b455bd4..df5b1a222 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -189,21 +189,13 @@ static volatile bool temp_meas_ready = false; #endif uint8_t fanSpeedBckp = 255; -#if EXTRUDERS > 3 - # error Unsupported number of extruders -#elif EXTRUDERS > 2 - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1, v2, v3 } -#elif EXTRUDERS > 1 - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1, v2 } -#else - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1 } -#endif +#define ARRAY_BY_EXTRUDERS(v1 ) { v1 } // Init min and max temp with extreme values to prevent false errors during startup -static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP ); -static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP ); -static int minttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 0, 0, 0 ); -static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383 ); +static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP ); +static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP ); +static int minttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 0 ); +static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383 ); #ifdef BED_MINTEMP static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; #endif @@ -217,8 +209,8 @@ static int ambient_minttemp_raw = AMBIENT_RAW_LO_TEMP; static int ambient_maxttemp_raw = AMBIENT_RAW_HI_TEMP; #endif -static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE ); -static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN ); +static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE ); +static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN ); static float analog2temp(int raw, uint8_t e); static float analog2tempBed(int raw); @@ -714,7 +706,7 @@ static float analog2tempAmbient(int raw) void soft_pwm_init() { -#if MB(RUMBA) && ((TEMP_SENSOR_0==-1)||(TEMP_SENSOR_1==-1)||(TEMP_SENSOR_2==-1)||(TEMP_SENSOR_BED==-1)) +#if MB(RUMBA) && ((TEMP_SENSOR_0==-1) || (TEMP_SENSOR_BED==-1)) //disable RUMBA JTAG in case the thermocouple extension is plugged on top of JTAG connector MCUCR=(1<USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -184,8 +182,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -437,8 +433,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 3cd87e2af..a646a5d85 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -164,8 +164,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -185,8 +183,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -438,8 +434,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 480f7b9b5..19848f3d8 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -163,8 +163,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -184,8 +182,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -437,8 +433,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 387a03507..71dac5cf7 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -164,8 +164,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -185,8 +183,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -438,8 +434,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 070d63ef1..5a11c881c 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -300,8 +300,6 @@ // Mintemps #define HEATER_0_MINTEMP 10 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -322,8 +320,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #define AMBIENT_MAXTEMP 100 @@ -588,8 +584,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 12d8971a0..6571f72cb 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -302,8 +302,6 @@ // Mintemps #define HEATER_0_MINTEMP 10 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -324,8 +322,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #define AMBIENT_MAXTEMP 100 @@ -592,8 +588,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3851e2220..4a3ba4011 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -102,8 +102,6 @@ EXTRUDER SETTINGS // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -120,8 +118,6 @@ EXTRUDER SETTINGS #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 150 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -367,8 +363,6 @@ THERMISTORS SETTINGS #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 9dc206959..10e9f71c4 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -101,8 +101,6 @@ EXTRUDER SETTINGS // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -119,8 +117,6 @@ EXTRUDER SETTINGS #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 150 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -366,8 +362,6 @@ THERMISTORS SETTINGS #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) From 327b5b230b0526038a2a1b12166cddcdb37e8fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 20:30:32 +0000 Subject: [PATCH 204/240] Remove soft_pwm_1 and soft_pwm_2 --- Firmware/temperature.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index df5b1a222..07192c0e1 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1142,20 +1142,6 @@ FORCE_INLINE static void soft_pwm_core() static unsigned char state_heater_0 = 0; static unsigned char state_timer_heater_0 = 0; #endif -#if (EXTRUDERS > 1) || defined(HEATERS_PARALLEL) - static unsigned char soft_pwm_1; -#ifdef SLOW_PWM_HEATERS - static unsigned char state_heater_1 = 0; - static unsigned char state_timer_heater_1 = 0; -#endif -#endif -#if EXTRUDERS > 2 - static unsigned char soft_pwm_2; -#ifdef SLOW_PWM_HEATERS - static unsigned char state_heater_2 = 0; - static unsigned char state_timer_heater_2 = 0; -#endif -#endif #if HEATER_BED_PIN > -1 // @@DR static unsigned char soft_pwm_b; #ifdef SLOW_PWM_HEATERS From c14332bfb2c6a1282e40dee4513a8de983b9a1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 20:34:45 +0000 Subject: [PATCH 205/240] Combine two ifdefs --- Firmware/temperature.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 07192c0e1..3d25961bc 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1141,14 +1141,11 @@ FORCE_INLINE static void soft_pwm_core() static unsigned char slow_pwm_count = 0; static unsigned char state_heater_0 = 0; static unsigned char state_timer_heater_0 = 0; -#endif #if HEATER_BED_PIN > -1 - // @@DR static unsigned char soft_pwm_b; -#ifdef SLOW_PWM_HEATERS static unsigned char state_heater_b = 0; static unsigned char state_timer_heater_b = 0; -#endif -#endif +#endif // HEATER_BED_PIN > -1 +#endif // SLOW_PWM_HEATERS #ifndef SLOW_PWM_HEATERS /* From 25522d3d68b70e883892cb15222d08c0fdbd0836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 20:44:55 +0000 Subject: [PATCH 206/240] Remove unused Autofan extruder configs --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 -- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 -- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 -- 8 files changed, 16 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 38e0505cf..0374ce209 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -204,8 +204,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index a646a5d85..2bb180eed 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -205,8 +205,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 19848f3d8..581546061 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -204,8 +204,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 71dac5cf7..af1fe3632 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -205,8 +205,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 5a11c881c..fa59c5fa7 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -343,8 +343,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 6571f72cb..c7c918fb4 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -345,8 +345,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed #define EXTRUDER_ALTFAN_DETECT diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 4a3ba4011..ff091f35f 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -137,8 +137,6 @@ EXTRUDER SETTINGS // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 10e9f71c4..a02348d62 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -136,8 +136,6 @@ EXTRUDER SETTINGS // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed From c7f0ee13bee6198b02e8c6649683af8a9b9f5b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 20:52:36 +0000 Subject: [PATCH 207/240] Missed these macros disable_e1/2 --- Firmware/Marlin_main.cpp | 20 ++------------------ Firmware/stepper.cpp | 24 ------------------------ Firmware/temperature.cpp | 14 +------------- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 67e8e86a8..ce66afc25 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4938,8 +4938,6 @@ void process_commands() disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); setTargetBed(0); //set bed target temperature back to 0 lcd_show_fullscreen_message_and_wait_P(_T(MSG_PINDA_CALIBRATION_DONE)); eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 1); @@ -6209,8 +6207,6 @@ Sigma_Exit: disable_heater(); st_synchronize(); disable_e0(); - disable_e1(); - disable_e2(); finishAndDisableSteppers(); fanSpeed = 0; _delay(1000); // Wait a little before to switch off @@ -6281,9 +6277,9 @@ Sigma_Exit: if (code_seen('X')) disable_x(); if (code_seen('Y')) disable_y(); if (code_seen('Z')) disable_z(); -#if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS +#if (E0_ENABLE_PIN != X_ENABLE_PIN) // Only enable on boards that have seperate ENABLE_PINS if (code_seen('E')) disable_e0(); - #endif +#endif } } break; @@ -9269,15 +9265,6 @@ void controllerFan() lastMotorCheck = _millis(); if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0) - #if EXTRUDERS > 2 - || !READ(E2_ENABLE_PIN) - #endif - #if EXTRUDER > 1 - #if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1 - || !READ(X2_ENABLE_PIN) - #endif - || !READ(E1_ENABLE_PIN) - #endif || !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled... { lastMotor = _millis(); //... set time to NOW so the fan will turn on @@ -9310,9 +9297,6 @@ void controllerFan() */ static void handleSafetyTimer() { -#if (EXTRUDERS > 1) -#error Implemented only for one extruder. -#endif //(EXTRUDERS > 1) if (printer_active() || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time)) { safetyTimer.stop(); diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 758e0dcdb..3e7e4c72c 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1102,12 +1102,6 @@ void st_init() #if defined(E0_DIR_PIN) && E0_DIR_PIN > -1 SET_OUTPUT(E0_DIR_PIN); #endif - #if defined(E1_DIR_PIN) && (E1_DIR_PIN > -1) - SET_OUTPUT(E1_DIR_PIN); - #endif - #if defined(E2_DIR_PIN) && (E2_DIR_PIN > -1) - SET_OUTPUT(E2_DIR_PIN); - #endif //Initialize Enable Pins - steppers default to disabled. @@ -1141,14 +1135,6 @@ void st_init() SET_OUTPUT(E0_ENABLE_PIN); if(!E_ENABLE_ON) WRITE(E0_ENABLE_PIN,HIGH); #endif - #if defined(E1_ENABLE_PIN) && (E1_ENABLE_PIN > -1) - SET_OUTPUT(E1_ENABLE_PIN); - if(!E_ENABLE_ON) WRITE(E1_ENABLE_PIN,HIGH); - #endif - #if defined(E2_ENABLE_PIN) && (E2_ENABLE_PIN > -1) - SET_OUTPUT(E2_ENABLE_PIN); - if(!E_ENABLE_ON) WRITE(E2_ENABLE_PIN,HIGH); - #endif //endstops and pullups #if defined(X_MIN_PIN) && X_MIN_PIN > -1 @@ -1246,16 +1232,6 @@ void st_init() WRITE(E0_STEP_PIN,INVERT_E_STEP_PIN); disable_e0(); #endif - #if defined(E1_STEP_PIN) && (E1_STEP_PIN > -1) - SET_OUTPUT(E1_STEP_PIN); - WRITE(E1_STEP_PIN,INVERT_E_STEP_PIN); - disable_e1(); - #endif - #if defined(E2_STEP_PIN) && (E2_STEP_PIN > -1) - SET_OUTPUT(E2_STEP_PIN); - WRITE(E2_STEP_PIN,INVERT_E_STEP_PIN); - disable_e2(); - #endif // waveform generation = 0100 = CTC TCCR1B &= ~(1< -1) SET_OUTPUT(HEATER_0_PIN); - #endif - #if defined(HEATER_1_PIN) && (HEATER_1_PIN > -1) - SET_OUTPUT(HEATER_1_PIN); - #endif - #if defined(HEATER_2_PIN) && (HEATER_2_PIN > -1) - SET_OUTPUT(HEATER_2_PIN); - #endif + #endif #if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1) SET_OUTPUT(HEATER_BED_PIN); #endif @@ -2027,12 +2021,6 @@ void disable_heater() #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1 && EXTRUDERS > 0 WRITE(HEATER_0_PIN,LOW); #endif -#if defined(HEATER_1_PIN) && HEATER_1_PIN > -1 && EXTRUDERS > 1 - WRITE(HEATER_1_PIN,LOW); -#endif -#if defined(HEATER_2_PIN) && HEATER_2_PIN > -1 && EXTRUDERS > 2 - WRITE(HEATER_2_PIN,LOW); -#endif #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // TODO: this doesn't take immediate effect! timer02_set_pwm0(0); From 0cf0d40a2e3c77ad5bec80b1905693580bffed64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Apr 2023 21:14:19 +0000 Subject: [PATCH 208/240] Remove checkAllHotends() --- Firmware/temperature.cpp | 8 -------- Firmware/temperature.h | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 53f5fe6c5..7672d7f2e 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -244,14 +244,6 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl static void temp_runaway_stop(bool isPreheat, bool isBed); #endif -// return "false", if all extruder-heaters are 'off' (ie. "true", if any heater is 'on') -bool checkAllHotends(void) -{ - bool result=false; - for(int i=0;i Date: Sat, 22 Apr 2023 12:32:56 +0000 Subject: [PATCH 209/240] Remove INVERT_E1_DIR and INVERT_E2_DIR from config I think these should be removed from the configuration files as these definitions don't do anything. --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 -- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 --- 8 files changed, 18 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 0374ce209..d227f54af 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 2bb180eed..33217ad65 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 581546061..6b0d3e8a7 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index af1fe3632..692616786 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index fa59c5fa7..dffc509d3 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -52,8 +52,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index c7c918fb4..3a2a1359c 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -54,8 +54,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index ff091f35f..31ded6c88 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -46,9 +46,6 @@ AXIS SETTINGS #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 - // Home position #define MANUAL_X_HOME_POS 0 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index a02348d62..9a8086739 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -46,9 +46,6 @@ AXIS SETTINGS #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 - // Home position #define MANUAL_X_HOME_POS 0 From 3509791943d7bd7c957fd3e76c3b4d461021352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Apr 2023 15:28:27 +0000 Subject: [PATCH 210/240] Drop sound feedback in lcd_v2_calibration Drop the sound feedback in lcd_v2_calibration when switching to lcd_generic_preheat_menu If a single filament setup (no MMU) has filament loaded, it will jump immediately to lcd_generic_preheat_menu this created double feedback. Let's just drop the feedback since the transition between menus is very fast. Change in memory: Flash: -8 bytes --- Firmware/ultralcd.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4cf991ec2..2b917f441 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3639,10 +3639,7 @@ void lcd_v2_calibration() { lcd_consume_click(); for (uint_least8_t i = 0; i < 20; i++) { //wait max. 2s delay_keep_alive(100); - if (LCD_CLICKED) { - // Click event is consumed below when - // rendering the preheat menu. We use this - // to check whether a audio feedback should be shown + if (lcd_clicked()) { break; } } @@ -3654,12 +3651,7 @@ void lcd_v2_calibration() { #endif //FILAMENT_SENSOR eFilamentAction = FilamentAction::Lay1Cal; - - // Produce feedback if the LCD knob was not clicked - // Note for non-MMU setups there is a 2 second timeout in case - // the user does not click the knob, in such a case we want feedback - // since the firmware is changing the menu silently. - menu_goto(lcd_generic_preheat_menu, 0, true, !lcd_clicked()); + menu_goto(lcd_generic_preheat_menu, 0, true); } void lcd_wizard() { From 1f181a949afcd0995960c12aad662197447602e9 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 09:48:09 +0200 Subject: [PATCH 211/240] Fix `lcd_encoder_diff` getting out of sync with the knob hard steps Flash: +18B SRAM: 0B --- Firmware/lcd.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 2fe042588..0e042e322 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -684,9 +684,11 @@ void lcd_knob_update() { if (lcd_backlight_wake_trigger) { lcd_backlight_wake_trigger = false; backlight_wake(); - if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { - lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; - lcd_encoder_diff = 0; + int8_t enc_diff = lcd_encoder_diff; + if (abs(enc_diff) >= ENCODER_PULSES_PER_STEP) { + lcd_encoder += enc_diff / ENCODER_PULSES_PER_STEP; + enc_diff %= ENCODER_PULSES_PER_STEP; + lcd_encoder_diff = enc_diff; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); From c037e6dfba6351cc5cae7e01259d6fa93d8c0acb Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 09:58:56 +0200 Subject: [PATCH 212/240] Use atomic block for accessing lcd_encoder_diff There was still the possibility of lcd_encoder_diff being updated from the ISR while the new enc_diff was being computed. Flash: +8B SRAM: 0B --- Firmware/lcd.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 0e042e322..d02e09bbc 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "Timer.h" @@ -684,15 +685,15 @@ void lcd_knob_update() { if (lcd_backlight_wake_trigger) { lcd_backlight_wake_trigger = false; backlight_wake(); - int8_t enc_diff = lcd_encoder_diff; - if (abs(enc_diff) >= ENCODER_PULSES_PER_STEP) { - lcd_encoder += enc_diff / ENCODER_PULSES_PER_STEP; - enc_diff %= ENCODER_PULSES_PER_STEP; - lcd_encoder_diff = enc_diff; - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); - } else { - Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); + bool did_rotate = false; + ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { + if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { + lcd_encoder += lcd_encoder_diff / ENCODER_PULSES_PER_STEP; + lcd_encoder_diff %= ENCODER_PULSES_PER_STEP; + did_rotate = true; + } } + Sound_MakeSound(did_rotate ? e_SOUND_TYPE_EncoderMove : e_SOUND_TYPE_ButtonEcho); if (lcd_draw_update == 0) { // Update LCD rendering at minimum From 5778e39687a1436cf2b5de3853062d240a1a777e Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 10:07:52 +0200 Subject: [PATCH 213/240] Resync `lcd_encoder_diff` when clicking Flash: +4B SRAM: 0B --- Firmware/lcd.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index d02e09bbc..b1b15176d 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -692,6 +692,11 @@ void lcd_knob_update() { lcd_encoder_diff %= ENCODER_PULSES_PER_STEP; did_rotate = true; } + else { + // Get lcd_encoder_diff in sync with the encoder hard steps. + // We assume that a click happens only when the knob is rotated into a stable position + lcd_encoder_diff = 0; + } } Sound_MakeSound(did_rotate ? e_SOUND_TYPE_EncoderMove : e_SOUND_TYPE_ButtonEcho); From 62991c8e67705a31ded26b43754a8c650ff76de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 23 Apr 2023 09:52:11 +0000 Subject: [PATCH 214/240] Fix issue where Tx gcode doesnt reset custom_message_type We need to call BeginReport and EndReport otherwise the SD filename is not shown when printing This only affects single material MMU gcodes Change in memory: Flash: -4 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 91c3c81fa..f5082b5ef 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -401,8 +401,7 @@ bool MMU2::tool_change(char code, uint8_t slot) { case 'x': { thermal_setExtrudeMintemp(0); // Allow cold extrusion since Tx only loads to the gears not nozzle - planner_synchronize(); - ToolChangeCommon(slot); // the only difference was manage_response(false, false), but probably good enough + tool_change(slot); thermal_setExtrudeMintemp(EXTRUDE_MINTEMP); } break; From 6390b3b69bbe543593b1d6eb4183bef4ab98d395 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 21 Apr 2023 13:21:39 +0200 Subject: [PATCH 215/240] Remove duplicate separator string Flash: -14B SRAM: 0B --- Firmware/ultralcd.cpp | 73 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2bfd7bd6..8850d5cea 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -89,7 +89,8 @@ static char lcd_status_message[LCD_WIDTH + 1]; static uint8_t lay1cal_filament = 0; -static const char separator[] PROGMEM = "--------------------"; +static const char STR_SEPARATOR[] PROGMEM = "--------------------"; +static_assert(sizeof(STR_SEPARATOR) == LCD_WIDTH + 1, "separator length must be updated to match screen width"); /** forward declarations **/ @@ -258,8 +259,6 @@ uint8_t selected_sheet = 0; bool bMain; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function bool bSettings; // flag (i.e. 'fake parameter') for 'lcd_hw_setup_menu()' function -const char STR_SEPARATOR[] PROGMEM = "------------"; - static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* longFilename) { uint8_t len = LCD_WIDTH - 1; @@ -1496,40 +1495,40 @@ void TestPullupCrash() { //! | 3.7.2.-2363 | c=16 //! | prusa3d.com | MSG_PRUSA3D //! | forum.prusa3d.com | MSG_PRUSA3D_FORUM -//! | help.prusa3d.com | MSG_PRUSA3D_HELP -//! | -------------- | STR_SEPARATOR +//! | help.prusa3d.com | MSG_PRUSA3D_HELP +//! | ------------------ | STR_SEPARATOR //! | 1_75mm_MK3 | FILAMENT_SIZE -//! | help.prusa3d.com | ELECTRONICS -//! | help.prusa3d.com | NOZZLE_TYPE -//! | -------------- | STR_SEPARATOR +//! | help.prusa3d.com | ELECTRONICS +//! | help.prusa3d.com | NOZZLE_TYPE +//! | ------------------ | STR_SEPARATOR //! | Date: | c=17 //! | MMM DD YYYY | __DATE__ -//! | -------------- | STR_SEPARATOR +//! | ------------------ | STR_SEPARATOR //! @endcode //! //! If MMU is connected //! -//! @code{.unparsed} -//! | MMU connected | c=18 -//! | FW: 1.0.6-7064523 | -//! @endcode +//! @code{.unparsed} +//! | MMU connected | c=18 +//! | FW: 1.0.6-7064523 | +//! @endcode //! //! If MMU is not connected //! -//! @code{.unparsed} -//! | MMU N/A | c=18 -//! @endcode +//! @code{.unparsed} +//! | MMU N/A | c=18 +//! @endcode //! //! If Flash Air is connected //! -//! @code{.unparsed} -//! | -------------- | STR_SEPARATOR -//! | FlashAir IP Addr: | c=18 -//! | 192.168.1.100 | -//! @endcode +//! @code{.unparsed} +//! | ------------------ | STR_SEPARATOR +//! | FlashAir IP Addr: | c=18 +//! | 192.168.1.100 | +//! @endcode //! //! @code{.unparsed} -//! | -------------- | STR_SEPARATOR +//! | ------------------ | STR_SEPARATOR //! | XYZ cal. details | MSG_XYZ_DETAILS c=18 //! | Extruder info | MSG_INFO_EXTRUDER //! | XYZ cal. details | MSG_INFO_SENSORS @@ -1537,8 +1536,8 @@ void TestPullupCrash() { //! //! If TMC2130 defined //! -//! @code{.unparsed} -//! | Belt status | MSG_BELT_STATUS +//! @code{.unparsed} +//! | Belt status | MSG_BELT_STATUS //! @endcode //! //! @code{.unparsed} @@ -1547,16 +1546,16 @@ void TestPullupCrash() { //! //! If Voltage Bed and PWR Pin are defined //! -//! @code{.unparsed} -//! | Voltages | MSG_MENU_VOLTAGES -//! @endcode +//! @code{.unparsed} +//! | Voltages | MSG_MENU_VOLTAGES +//! @endcode //! //! //! If DEBUG_BUILD is defined //! -//! @code{.unparsed} -//! | Debug | c=18 -//! @endcode +//! @code{.unparsed} +//! | Debug | c=18 +//! @endcode //! ---------------------- //! @endcode static void lcd_support_menu() @@ -2421,7 +2420,7 @@ void lcd_move_e() //! @code{.unparsed} //! |01234567890123456789| //! |Y distance from min | MSG_Y_DIST_FROM_MIN -//! | -------------- | STR_SEPARATOR +//! |--------------------| STR_SEPARATOR //! |Left: 00.00mm| MSG_LEFT c=10, c=8 //! |Right: 00.00mm| MSG_RIGHT c=10, c=8 //! ---------------------- @@ -2439,7 +2438,7 @@ static void lcd_menu_xyz_y_min() "%S:" ), _i("Y distance from min"), ////MSG_Y_DIST_FROM_MIN c=20 - separator, + STR_SEPARATOR, _i("Left"), ////MSG_LEFT c=10 _i("Right") ////MSG_RIGHT c=10 ); @@ -2464,7 +2463,7 @@ float _deg(float rad) //! @code{.unparsed} //! |01234567890123456789| //! |Measured skew :0.00D| MSG_MEASURED_SKEW c=14 -//! | -------------- | STR_SEPARATOR +//! |--------------------| STR_SEPARATOR //! |Slight skew :0.12D| MSG_SLIGHT_SKEW c=14 //! |Severe skew :0.25D| MSG_SEVERE_SKEW c=14 //! ---------------------- @@ -2482,7 +2481,7 @@ static void lcd_menu_xyz_skew() "%-14.14S:%3.2f\x01" ), _i("Measured skew"), ////MSG_MEASURED_SKEW c=14 - separator, + STR_SEPARATOR, _i("Slight skew"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=14 _i("Severe skew"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=14 ); @@ -2500,7 +2499,7 @@ static void lcd_menu_xyz_skew() //! @code{.unparsed} //! |01234567890123456789| //! |[0;0] point offset | MSG_MEASURED_OFFSET c=20 -//! | -------------- | STR_SEPARATOR +//! |--------------------| STR_SEPARATOR //! |X 00.00mm| c=10 //! |Y 00.00mm| c=10 //! ---------------------- @@ -2509,7 +2508,7 @@ static void lcd_menu_xyz_skew() static void lcd_menu_xyz_offset() { lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=20 - lcd_puts_at_P(0, 1, separator); + lcd_puts_at_P(0, 1, STR_SEPARATOR); for (uint8_t i = 0; i < 2; i++) { lcd_set_cursor(0, i + 2); @@ -6952,7 +6951,7 @@ static uint8_t lcd_selftest_screen(TestScreen screen, uint8_t _progress, uint8_t if (screen == TestScreen::Failed) lcd_puts_P(_T(MSG_SELFTEST_FAILED)); if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////MSG_CALIBRATING_HOME c=20 - lcd_puts_at_P(0, 1, separator); + lcd_puts_at_P(0, 1, STR_SEPARATOR); if ((screen >= TestScreen::ExtruderFan) && (screen <= TestScreen::FansOk)) { //SERIAL_ECHOLNPGM("Fan test"); From 02a0f6a35a93c3361bce74e593e223d39d25c63e Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 21 Apr 2023 14:56:26 +0200 Subject: [PATCH 216/240] Correctly utilize the menu stack in the Mode select message Flash: -34B SRAM: 0B --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8850d5cea..d0c33ea96 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3425,8 +3425,7 @@ static void crash_mode_switch() { lcd_crash_detect_enable(); } - if (printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal)) menu_goto(lcd_tune_menu, 9, true, true); - else menu_goto(lcd_settings_menu, 9, true, true); + menu_back(); } #endif //TMC2130 From 9272545deb0f1d500664986c867d47c54939ff7b Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 21 Apr 2023 17:42:50 +0200 Subject: [PATCH 217/240] Dead code cleanup --- Firmware/mesh_bed_calibration.cpp | 19 --------- Firmware/mesh_bed_calibration.h | 10 +---- Firmware/ultralcd.cpp | 67 ++++--------------------------- 3 files changed, 8 insertions(+), 88 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 308421010..8c82acc91 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3101,25 +3101,6 @@ void count_xyz_details(float (&distanceMin)[2]) { distanceMin[mesh_point] = (y - Y_MIN_POS_CALIBRATION_POINT_OUT_OF_REACH); } } -/* -e_MBL_TYPE e_mbl_type = e_MBL_OPTIMAL; - -void mbl_mode_set() { - switch (e_mbl_type) { - case e_MBL_OPTIMAL: e_mbl_type = e_MBL_PREC; break; - case e_MBL_PREC: e_mbl_type = e_MBL_FAST; break; - case e_MBL_FAST: e_mbl_type = e_MBL_OPTIMAL; break; - default: e_mbl_type = e_MBL_OPTIMAL; break; - } - eeprom_update_byte((uint8_t*)EEPROM_MBL_TYPE,(uint8_t)e_mbl_type); -} - -void mbl_mode_init() { - uint8_t mbl_type = eeprom_read_byte((uint8_t*)EEPROM_MBL_TYPE); - if (mbl_type == 0xFF) e_mbl_type = e_MBL_OPTIMAL; - else e_mbl_type = mbl_type; -} -*/ void mbl_settings_init() { //3x3 mesh; 3 Z-probes on each point, magnet elimination on diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 02b97cc2d..fcfa9527b 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -201,15 +201,7 @@ extern void babystep_reset(); extern void count_xyz_details(float (&distanceMin)[2]); extern bool sample_z(); -/* -typedef enum -{ - e_MBL_FAST, e_MBL_OPTIMAL, e_MBL_PREC -} e_MBL_TYPE; -*/ -//extern e_MBL_TYPE e_mbl_type; -//extern void mbl_mode_set(); -//extern void mbl_mode_init(); + extern void mbl_settings_init(); extern bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d0c33ea96..b92016bb7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -24,7 +24,6 @@ #include "mesh_bed_leveling.h" #include "mesh_bed_calibration.h" -//#include "Configuration.h" #include "cmdqueue.h" #include "Filament_sensor.h" @@ -95,8 +94,6 @@ static_assert(sizeof(STR_SEPARATOR) == LCD_WIDTH + 1, "separator length must be /** forward declarations **/ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg); -// void copy_and_scalePID_i(); -// void copy_and_scalePID_d(); /* Different menus */ #if (LANG_MODE != 0) @@ -104,7 +101,6 @@ static void lcd_language_menu(); #endif static void lcd_main_menu(); static void lcd_tune_menu(); -//static void lcd_move_menu(); static void lcd_settings_menu(); static void lcd_calibration_menu(); static void lcd_control_temperature_menu(); @@ -1593,13 +1589,6 @@ static void lcd_support_menu() #if (FW_DEV_VERSION != FW_VERSION_GOLD) && (FW_DEV_VERSION != FW_VERSION_RC) MENU_ITEM_BACK_P(PSTR(" repo " FW_REPOSITORY)); #endif - // Ideally this block would be optimized out by the compiler. -/* const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P()); - if (fw_string_len < 6) { - MENU_ITEM_BACK_P(PSTR(MSG_FW_VERSION " - " FW_version)); - } else { - MENU_ITEM_BACK_P(PSTR("FW - " FW_version)); - }*/ MENU_ITEM_BACK_P(_n("prusa3d.com"));////MSG_PRUSA3D c=18 MENU_ITEM_BACK_P(_n("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18 @@ -3392,10 +3381,7 @@ static void lcd_silent_mode_set() { // Wait until the planner queue is drained and the stepper routine achieves // an idle state. st_synchronize(); - if (tmc2130_wait_standstill_xy(1000)) {} -// MYSERIAL.print("standstill OK"); -// else -// MYSERIAL.print("standstill NG!"); + tmc2130_wait_standstill_xy(1000); cli(); tmc2130_mode = (SilentModeMenu != SILENT_MODE_NORMAL)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; update_mode_profile(); @@ -4171,29 +4157,6 @@ while (0) #define SETTINGS_MMU_MODE #endif //MMU_FORCE_STEALTH_MODE -/* -#define SETTINGS_MBL_MODE \ -do\ -{\ - switch(e_mbl_type)\ - {\ - case e_MBL_FAST:\ - MENU_ITEM_FUNCTION_P(_n("Mode [Fast]"),mbl_mode_set);\ - break; \ - case e_MBL_OPTIMAL:\ - MENU_ITEM_FUNCTION_P(_n("Mode [Optimal]"), mbl_mode_set); \ - break; \ - case e_MBL_PREC:\ - MENU_ITEM_FUNCTION_P(_n("Mode [Precise]"), mbl_mode_set); \ - break; \ - default:\ - MENU_ITEM_FUNCTION_P(_n("Mode [Optimal]"), mbl_mode_set); \ - break; \ - }\ -}\ -while (0) -*/ - #define SETTINGS_MMU_LOADING_TEST \ do\ {\ @@ -4384,12 +4347,12 @@ while (0) static void lcd_checking_menu(void) { -MENU_BEGIN(); -MENU_ITEM_BACK_P(_T(MSG_HW_SETUP)); -SETTINGS_MODE; -SETTINGS_MODEL; -SETTINGS_VERSION; -MENU_END(); + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_HW_SETUP)); + SETTINGS_MODE; + SETTINGS_MODEL; + SETTINGS_VERSION; + MENU_END(); } template @@ -4955,18 +4918,6 @@ void unload_filament(float unloadLength) eFilamentAction = FilamentAction::None; } -#include "xflash.h" - -#ifdef LCD_TEST -static void lcd_test_menu() -{ - XFLASH_SPI_ENTER(); - xflash_enable_wr(); - xflash_chip_erase(); - xflash_disable_wr(); -} -#endif //LCD_TEST - /// @brief Set print fan speed /// @param speed ranges from 0 to 255 static void lcd_selftest_setfan(const uint8_t speed) { @@ -5324,9 +5275,6 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////MSG_MMU_FAIL_STATS c=18 } MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=18 -#ifdef LCD_TEST - MENU_ITEM_SUBMENU_P(_i("XFLASH init"), lcd_test_menu);////MSG_XFLASH c=18 -#endif //LCD_TEST MENU_END(); @@ -5528,7 +5476,6 @@ static void lcd_mesh_bed_leveling_settings() MENU_ITEM_TOGGLE(_T(MSG_Z_PROBE_NR), sToggle, mbl_probe_nr_toggle); MENU_ITEM_TOGGLE_P(_T(MSG_MAGNETS_COMP), (points_nr == 7) ? (magnet_elimination ? _T(MSG_ON): _T(MSG_OFF)) : _T(MSG_NA), mbl_magnets_elimination_toggle); MENU_END(); - //SETTINGS_MBL_MODE; } #ifdef LCD_BL_PIN From 9de2cbfe8eafebafbb47f7378caeaef8a424dc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Apr 2023 13:23:14 +0000 Subject: [PATCH 218/240] Fix an issue with crash_mode_switch toggling Proposed changes --- Firmware/ultralcd.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b92016bb7..90efb9f54 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3403,15 +3403,8 @@ static void lcd_silent_mode_set() { #ifdef TMC2130 static void crash_mode_switch() { - if (lcd_crash_detect_enabled()) - { - lcd_crash_detect_disable(); - } - else - { - lcd_crash_detect_enable(); - } - menu_back(); + if (lcd_crash_detect_enabled()) lcd_crash_detect_disable(); + else lcd_crash_detect_enable(); } #endif //TMC2130 From 5b7266fdf1d261fd9a27f311c94f57bb65a8e191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 23 Apr 2023 09:43:23 +0000 Subject: [PATCH 219/240] Don't render message when printer is idle Guard the lcd_display_message_fullscreen_P call by blocks_queued(). If there are no planned moves, there is no need to render this message, it creates a weird LCD draw noticable by the user. Change in memory: Flash: +10 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90efb9f54..6c68fe38a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3377,15 +3377,18 @@ static void lcd_silent_mode_set() { } eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu); #ifdef TMC2130 - lcd_display_message_fullscreen_P(_i("Mode change in progress..."));////MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 - // Wait until the planner queue is drained and the stepper routine achieves - // an idle state. - st_synchronize(); + if (blocks_queued()) + { + lcd_display_message_fullscreen_P(_i("Mode change in progress..."));////MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 + // Wait until the planner queue is drained and the stepper routine achieves + // an idle state. + st_synchronize(); + } tmc2130_wait_standstill_xy(1000); - cli(); - tmc2130_mode = (SilentModeMenu != SILENT_MODE_NORMAL)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; - update_mode_profile(); - tmc2130_init(TMCInitParams(false, FarmOrUserECool())); + cli(); + tmc2130_mode = (SilentModeMenu != SILENT_MODE_NORMAL)?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; + update_mode_profile(); + tmc2130_init(TMCInitParams(false, FarmOrUserECool())); // We may have missed a stepper timer interrupt due to the time spent in tmc2130_init. // Be safe than sorry, reset the stepper timer before re-enabling interrupts. st_reset_timer(); From 548ed0eb31b4b371eef4c3eeead3e1d8a88fc325 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 10:42:09 +0200 Subject: [PATCH 220/240] Convert to native binary literals --- Firmware/lcd.cpp | 206 +++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index b1b15176d..cc640a2ca 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -810,114 +810,114 @@ void lcd_buttons_update(void) // Custom character data const uint8_t lcd_chardata_bedTemp[8] PROGMEM = { - B00000, - B11111, - B10101, - B10001, - B10101, - B11111, - B00000, - B00000}; //thanks Sonny Mounicou + 0b00000, + 0b11111, + 0b10101, + 0b10001, + 0b10101, + 0b11111, + 0b00000, + 0b00000}; //thanks Sonny Mounicou const uint8_t lcd_chardata_degree[8] PROGMEM = { - B01100, - B10010, - B10010, - B01100, - B00000, - B00000, - B00000, - B00000}; + 0b01100, + 0b10010, + 0b10010, + 0b01100, + 0b00000, + 0b00000, + 0b00000, + 0b00000}; const uint8_t lcd_chardata_thermometer[8] PROGMEM = { - B00100, - B01010, - B01010, - B01010, - B01010, - B10001, - B10001, - B01110}; + 0b00100, + 0b01010, + 0b01010, + 0b01010, + 0b01010, + 0b10001, + 0b10001, + 0b01110}; const uint8_t lcd_chardata_uplevel[8] PROGMEM = { - B00100, - B01110, - B11111, - B00100, - B11100, - B00000, - B00000, - B00000}; //thanks joris + 0b00100, + 0b01110, + 0b11111, + 0b00100, + 0b11100, + 0b00000, + 0b00000, + 0b00000}; //thanks joris const uint8_t lcd_chardata_refresh[8] PROGMEM = { - B00000, - B00110, - B11001, - B11000, - B00011, - B10011, - B01100, - B00000}; //thanks joris + 0b00000, + 0b00110, + 0b11001, + 0b11000, + 0b00011, + 0b10011, + 0b01100, + 0b00000}; //thanks joris const uint8_t lcd_chardata_folder[8] PROGMEM = { - B00000, - B11100, - B11111, - B10001, - B10001, - B11111, - B00000, - B00000}; //thanks joris + 0b00000, + 0b11100, + 0b11111, + 0b10001, + 0b10001, + 0b11111, + 0b00000, + 0b00000}; //thanks joris /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B11100, - B10000, - B11000, - B10111, - B00101, - B00110, - B00101, - B00000};*/ //thanks Sonny Mounicou + 0b11100, + 0b10000, + 0b11000, + 0b10111, + 0b00101, + 0b00110, + 0b00101, + 0b00000};*/ //thanks Sonny Mounicou /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B11100, - B10100, - B11000, - B10100, - B00000, - B00111, - B00010, - B00010};*/ + 0b11100, + 0b10100, + 0b11000, + 0b10100, + 0b00000, + 0b00111, + 0b00010, + 0b00010};*/ /*const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B01100, - B10011, - B00000, - B01100, - B10011, - B00000, - B01100, - B10011};*/ + 0b01100, + 0b10011, + 0b00000, + 0b01100, + 0b10011, + 0b00000, + 0b01100, + 0b10011};*/ const uint8_t lcd_chardata_feedrate[8] PROGMEM = { - B00000, - B00100, - B10010, - B01001, - B10010, - B00100, - B00000, - B00000}; + 0b00000, + 0b00100, + 0b10010, + 0b01001, + 0b10010, + 0b00100, + 0b00000, + 0b00000}; const uint8_t lcd_chardata_clock[8] PROGMEM = { - B00000, - B01110, - B10011, - B10101, - B10001, - B01110, - B00000, - B00000}; //thanks Sonny Mounicou + 0b00000, + 0b01110, + 0b10011, + 0b10101, + 0b10001, + 0b01110, + 0b00000, + 0b00000}; //thanks Sonny Mounicou void lcd_set_custom_characters(void) { @@ -932,23 +932,23 @@ void lcd_set_custom_characters(void) } const uint8_t lcd_chardata_arr2down[8] PROGMEM = { - B00000, - B00000, - B10001, - B01010, - B00100, - B10001, - B01010, - B00100}; + 0b00000, + 0b00000, + 0b10001, + 0b01010, + 0b00100, + 0b10001, + 0b01010, + 0b00100}; const uint8_t lcd_chardata_confirm[8] PROGMEM = { - B00000, - B00001, - B00011, - B10110, - B11100, - B01000, - B00000}; + 0b00000, + 0b00001, + 0b00011, + 0b10110, + 0b11100, + 0b01000, + 0b00000}; void lcd_set_custom_characters_nextpage(void) { From 17e085040c977d54423c20724b4aaec6f0f832b8 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 10:44:48 +0200 Subject: [PATCH 221/240] Add missing line to custom character Shouldn't make a difference since the array is already defined as 8B long, but I just found it weird and surprising when I noticed only 7 lines were defined --- Firmware/lcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index cc640a2ca..2027b84da 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -948,6 +948,7 @@ const uint8_t lcd_chardata_confirm[8] PROGMEM = { 0b10110, 0b11100, 0b01000, + 0b00000, 0b00000}; void lcd_set_custom_characters_nextpage(void) From 78614f5670bde11ab0c691f2ceaed525719bacf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 24 Apr 2023 09:09:43 +0000 Subject: [PATCH 222/240] M701/M702: Set default Z value to 0 Set default Z value to 0 to maintain backwards compatibility with older gcodes. --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ce66afc25..fdf8dca6d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8399,13 +8399,13 @@ Sigma_Exit: - `P` - n index of MMU slot (zero based, so 0-4 like T0 and T4) - `T` - Alias of `P`. Used for compatibility with Marlin - `L` - Extrude distance for insertion (positive value)(manual reload) - - `Z` - Move the Z axis by this distance. Default value MIN_Z_FOR_LOAD + - `Z` - Move the Z axis by this distance. Default value is 0 to maintain backwards compatibility with older gcodes. */ case 701: { uint8_t mmuSlotIndex = 0xffU; float fastLoadLength = FILAMENTCHANGE_FIRSTFEED; // Only used without MMU - float z_target = MIN_Z_FOR_LOAD; + float z_target = 0; if( MMU2::mmu2.Enabled() ) { if( code_seen('P') || code_seen('T') ) { @@ -8437,11 +8437,11 @@ Sigma_Exit: #### Parameters - `U` - Retract distance for removal (manual reload). Default value is 0. - - `Z` - Move the Z axis by this distance. Default value MIN_Z_FOR_UNLOAD. + - `Z` - Move the Z axis by this distance. Default value is 0 to maintain backwards compatibility with older gcodes. */ case 702: { - float z_target = MIN_Z_FOR_UNLOAD; + float z_target = 0; float unloadLength = FILAMENTCHANGE_FINALRETRACT; if (code_seen('U')) unloadLength = code_value(); From dd16cf45259981bd8f93513de5ad877099681e65 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 09:13:17 +0200 Subject: [PATCH 223/240] Remove Binary.h include --- Firmware/lcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 2027b84da..4a88f7ea6 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -10,7 +10,6 @@ #include "Configuration.h" #include "pins.h" -#include #include #include "Marlin.h" #include "fastio.h" From ea101f49d4aa3c66da90dc630fde1a7f642d78bc Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 22:44:38 +0200 Subject: [PATCH 224/240] `lcd_buttons` is actually `lcd_click_trigger` Flash: -4B SRAM: 0B --- Firmware/lcd.cpp | 4 ++-- Firmware/lcd.h | 22 ++++------------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index b1b15176d..36e58eb59 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -635,7 +635,7 @@ uint8_t lcd_draw_update = 2; int16_t lcd_encoder = 0; static int8_t lcd_encoder_diff = 0; -uint8_t lcd_buttons = 0; +uint8_t lcd_click_trigger = 0; uint8_t lcd_update_enabled = 1; static bool lcd_backlight_wake_trigger; // Flag set by interrupt when the knob is pressed or rotated @@ -776,7 +776,7 @@ void lcd_buttons_update(void) lcd_button_pressed = 0; // Reset to prevent double triggering if (!lcd_long_press_active) { //button released before long press gets activated - lcd_buttons |= EN_C; // This flag is reset when the event is consumed + lcd_click_trigger = 1; // This flag is reset when the event is consumed } lcd_backlight_wake_trigger = true; // flag event, knob pressed lcd_long_press_active = 0; diff --git a/Firmware/lcd.h b/Firmware/lcd.h index aedfc38d3..13377da70 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -100,8 +100,7 @@ extern uint8_t lcd_draw_update; extern int16_t lcd_encoder; -//the last checked lcd_buttons in a bit array. -extern uint8_t lcd_buttons; +extern uint8_t lcd_click_trigger; extern uint8_t lcd_update_enabled; @@ -156,20 +155,7 @@ private: bool m_updateEnabled; }; - //////////////////////////////////// -// Setup button and encode mappings for each panel (into 'lcd_buttons' variable -// -// This is just to map common functions (across different panels) onto the same -// macro name. The mapping is independent of whether the button is directly connected or -// via a shift/i2c register. - -#define BLEN_B 1 -#define BLEN_A 0 -#define EN_B (1< Date: Sun, 23 Apr 2023 23:21:24 +0200 Subject: [PATCH 225/240] lcd encoder: use lookup table Also handle the scenario where the encoder moves two steps in a single lcd_buttons_update cycle. Flash: -46B SRAM: 0B --- Firmware/lcd.cpp | 30 ++++++++++++++++-------------- Firmware/lcd.h | 8 -------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 36e58eb59..e6a2d4c40 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -751,7 +751,6 @@ void lcd_buttons_update(void) { static uint8_t lcd_long_press_active = 0; static uint8_t lcd_button_pressed = 0; - static uint8_t lcd_encoder_bits = 0; if (READ(BTN_ENC) == 0) { //button is pressed if (buttonBlanking.expired_cont(BUTTON_BLANKING_TIME)) { @@ -784,24 +783,27 @@ void lcd_buttons_update(void) } //manage encoder rotation - #define ENCODER_SPIN(_E1, _E2) switch (lcd_encoder_bits) { case _E1: lcd_encoder_diff++; break; case _E2: lcd_encoder_diff--; } - uint8_t enc = 0; - if (READ(BTN_EN1) == 0) enc |= B01; - if (READ(BTN_EN2) == 0) enc |= B10; - if (enc != lcd_encoder_bits) + static const int8_t encrot_table[] PROGMEM = { + 0, -1, 1, 2, + 1, 0, 2, -1, + -1, 2, 0, 1, + 2, 1, -1, 0, + }; + + static uint8_t enc_bits_old = 0; + uint8_t enc_bits = 0; + if (!READ(BTN_EN1)) enc_bits |= _BV(0); + if (!READ(BTN_EN2)) enc_bits |= _BV(1); + + if (enc_bits != enc_bits_old) { - switch (enc) - { - case encrot0: ENCODER_SPIN(encrot3, encrot1); break; - case encrot1: ENCODER_SPIN(encrot0, encrot2); break; - case encrot2: ENCODER_SPIN(encrot1, encrot3); break; - case encrot3: ENCODER_SPIN(encrot2, encrot0); break; - } + int8_t newDiff = pgm_read_byte(&encrot_table[(enc_bits_old << 2) | enc_bits]); + lcd_encoder_diff += newDiff; if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP) { lcd_backlight_wake_trigger = true; // flag event, knob rotated } - lcd_encoder_bits = enc; + enc_bits_old = enc_bits; } } diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 13377da70..2a4682739 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -168,14 +168,6 @@ private: //! @retval 1 button was clicked #define LCD_CLICKED (lcd_click_trigger) -// Setup Rotary Encoder Bit Values (for two pin encoders to indicate movement) -// These values are independent of which pins are used for EN_A and EN_B indications -// The rotary encoder part is also independent to the chipset used for the LCD -#define encrot0 0 -#define encrot1 2 -#define encrot2 3 -#define encrot3 1 - //////////////////////////////////// //Custom characters defined in the first 8 characters of the LCD From c339711025af7c16719da30242f00ef9c7a63ecd Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 24 Apr 2023 09:15:31 +0200 Subject: [PATCH 226/240] Make the encrot table balanced It won't change much. It is not possible to determine in which direction the encoder spun when two steps are made, so just use + or - 2. --- Firmware/lcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index e6a2d4c40..13d8c7106 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -786,8 +786,8 @@ void lcd_buttons_update(void) static const int8_t encrot_table[] PROGMEM = { 0, -1, 1, 2, 1, 0, 2, -1, - -1, 2, 0, 1, - 2, 1, -1, 0, + -1, -2, 0, 1, + -2, 1, -1, 0, }; static uint8_t enc_bits_old = 0; From 67f0fe0fceb3fccee54990e4e7ff56643ec61f03 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 23:25:19 +0200 Subject: [PATCH 227/240] Remove AUTOTEMP menu items They are commented out and broken anyway --- Firmware/ultralcd.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6c68fe38a..0d1430fb5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5515,13 +5515,6 @@ static void lcd_control_temperature_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); #endif MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); -#if defined AUTOTEMP && (TEMP_SENSOR_0 != 0) -//MENU_ITEM_EDIT removed, following code must be redesigned if AUTOTEMP enabled - MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled); - MENU_ITEM_EDIT(float3, _n(" \xdf Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10); - MENU_ITEM_EDIT(float3, _n(" \xdf Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10); - MENU_ITEM_EDIT(float32, _n(" \xdf Fact"), &autotemp_factor, 0.0, 1.0); -#endif MENU_END(); } From 4a2a89cb742397cd2642370446d7d9cd807888c4 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 23:25:35 +0200 Subject: [PATCH 228/240] Remove stupid comments from older bad code --- Firmware/ultralcd.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d1430fb5..c6bbcc886 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5390,20 +5390,20 @@ static void lcd_tune_menu() SilentModeMenu = eeprom_read_byte((uint8_t*) EEPROM_SILENT); MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); //1 - MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED c=15 + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);////MSG_SPEED c=15 - MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3 + MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10); - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255);//5 - MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=15 + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); + MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);////MSG_FLOW c=15 #ifdef LA_LIVE_K - MENU_ITEM_EDIT_advance_K();//7 + MENU_ITEM_EDIT_advance_K(); #endif #ifdef FILAMENTCHANGEENABLE if (!farm_mode) - MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change); #endif #ifdef FILAMENT_SENSOR From c83646743f5bfb49a9aa4478009cd47d3a31522c Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 23:48:11 +0200 Subject: [PATCH 229/240] Deduplicate MMU settings Flash: -58B SRAM: 0B --- Firmware/ultralcd.cpp | 120 ++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 76 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c6bbcc886..455f8b817 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4054,27 +4054,17 @@ static void lcd_fsensor_settings_menu() { #endif //FILAMENT_SENSOR -static void settingsSpoolJoin() +static void menuitems_MMU_settings_common() { MENU_ITEM_TOGGLE_P(MSG_SPOOL_JOIN, SpoolJoin::spooljoin.isSpoolJoinEnabled() ? _T(MSG_ON) : _T(MSG_OFF), SpoolJoin::spooljoin.toggleSpoolJoin); -} - -#define SETTINGS_SPOOLJOIN \ -do\ -{\ - settingsSpoolJoin();\ -}\ -while(0)\ #ifdef MMU_HAS_CUTTER -static void settingsCutter() -{ - if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t *)EEPROM_MMU_CUTTER_ENABLED)) { MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ON), lcd_cutter_enabled); } #ifdef MMU_ALWAYS_CUT - else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t *)EEPROM_MMU_CUTTER_ENABLED)) { MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_ALWAYS), lcd_cutter_enabled); } @@ -4083,17 +4073,12 @@ static void settingsCutter() { MENU_ITEM_TOGGLE_P(_T(MSG_CUTTER), _T(MSG_OFF), lcd_cutter_enabled); } -} +#endif // MMU_HAS_CUTTER -#define SETTINGS_CUTTER \ -do\ -{\ - settingsCutter();\ -}\ -while(0) -#else -#define SETTINGS_CUTTER -#endif //MMU_HAS_CUTTER +#ifndef MMU_FORCE_STEALTH_MODE + MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), eeprom_read_byte((uint8_t *)EEPROM_MMU_STEALTH) ? _T(MSG_STEALTH) : _T(MSG_NORMAL), lcd_mmu_mode_toggle); +#endif // MMU_FORCE_STEALTH_MODE +} static void mmu_enable_switch() { @@ -4109,29 +4094,38 @@ static void mmu_enable_switch() } } -static void mmu_reset() +static void SETTINGS_SILENT_MODE() { - MMU2::mmu2.Reset(MMU2::MMU2::ResetForm::Software); -} - -static void SETTINGS_SILENT_MODE() { - if (!farm_mode) { //dont show in menu if we are in farm mode + if (!farm_mode) + { // dont show in menu if we are in farm mode #ifdef TMC2130 - if (eeprom_read_byte((uint8_t*)EEPROM_SILENT) == SILENT_MODE_NORMAL) { - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); - MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), lcd_crash_detect_enabled() ? _T(MSG_ON) : _T(MSG_OFF), crash_mode_switch); - } else { - MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); - MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); + if (eeprom_read_byte((uint8_t *)EEPROM_SILENT) == SILENT_MODE_NORMAL) + { + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); + MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), lcd_crash_detect_enabled() ? _T(MSG_ON) : _T(MSG_OFF), crash_mode_switch); } -#else //TMC2130 - switch (eeprom_read_byte((uint8_t*)EEPROM_SILENT)) { - case SILENT_MODE_POWER: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; - case SILENT_MODE_SILENT: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); break; - case SILENT_MODE_AUTO: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); break; - default: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; // (probably) not needed - } -#endif //TMC2130 + else + { + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); + MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); + } +#else // TMC2130 + switch (eeprom_read_byte((uint8_t *)EEPROM_SILENT)) + { + case SILENT_MODE_POWER: + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); + break; + case SILENT_MODE_SILENT: + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); + break; + case SILENT_MODE_AUTO: + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); + break; + default: + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); + break; // (probably) not needed + } +#endif // TMC2130 } } @@ -4139,27 +4133,6 @@ void SETTINGS_FANS_CHECK() { MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); } -#ifndef MMU_FORCE_STEALTH_MODE -#define SETTINGS_MMU_MODE \ -do\ -{\ - if (MMU2::mmu2.Enabled())\ - {\ - MENU_ITEM_TOGGLE_P(_T(MSG_MMU_MODE), eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) ? _T(MSG_STEALTH) : _T(MSG_NORMAL), lcd_mmu_mode_toggle);\ - }\ -}\ -while (0) -#else //MMU_FORCE_STEALTH_MODE -#define SETTINGS_MMU_MODE -#endif //MMU_FORCE_STEALTH_MODE - -#define SETTINGS_MMU_LOADING_TEST \ -do\ -{\ - MENU_ITEM_SUBMENU_P(_T(MSG_LOADING_TEST), mmu_loading_test_menu); \ -}\ -while (0) - #define SETTINGS_SOUND \ do\ {\ @@ -4446,18 +4419,15 @@ static void lcd_settings_menu() #endif //FILAMENT_SENSOR MENU_ITEM_TOGGLE_P(PSTR("MMU"), eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED) ? _T(MSG_ON) : _T(MSG_OFF), mmu_enable_switch); + if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED)) + { // Communication with MMU not required to reset MMU + MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), []() { MMU2::mmu2.Reset(MMU2::MMU2::ResetForm::Software); }); + } if (MMU2::mmu2.Enabled()) { // Only show menus when communicating with MMU - SETTINGS_SPOOLJOIN; - SETTINGS_CUTTER; - SETTINGS_MMU_MODE; - SETTINGS_MMU_LOADING_TEST; - } - - if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED)) - { // Communication with MMU not required to reset MMU - MENU_ITEM_FUNCTION_P(PSTR("Reset MMU"), mmu_reset); + menuitems_MMU_settings_common(); + MENU_ITEM_SUBMENU_P(_T(MSG_LOADING_TEST), mmu_loading_test_menu); } SETTINGS_FANS_CHECK(); @@ -5412,13 +5382,11 @@ static void lcd_tune_menu() if (MMU2::mmu2.Enabled()) { - SETTINGS_SPOOLJOIN; - SETTINGS_CUTTER; + menuitems_MMU_settings_common(); } SETTINGS_FANS_CHECK(); SETTINGS_SILENT_MODE(); - SETTINGS_MMU_MODE; SETTINGS_SOUND; #ifdef LCD_BL_PIN if (backlightSupport) From e662ef276e71a6e7ea4e6492bf8be5ed14350174 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 23 Apr 2023 23:51:29 +0200 Subject: [PATCH 230/240] Deduplicate temperature settings Flash: -52B SRAM: 0B --- Firmware/ultralcd.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 455f8b817..6060302fa 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4129,6 +4129,16 @@ static void SETTINGS_SILENT_MODE() } } +static void menuitems_temperature_common() { +#if TEMP_SENSOR_0 != 0 + MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); +#endif +#if TEMP_SENSOR_BED != 0 + MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 5); +#endif + MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); +} + void SETTINGS_FANS_CHECK() { MENU_ITEM_TOGGLE_P(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); } @@ -5363,10 +5373,8 @@ static void lcd_tune_menu() MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);////MSG_SPEED c=15 - MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); - MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10); + menuitems_temperature_common(); - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);////MSG_FLOW c=15 #ifdef LA_LIVE_K MENU_ITEM_EDIT_advance_K(); @@ -5476,13 +5484,8 @@ static void lcd_control_temperature_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); -#if TEMP_SENSOR_0 != 0 - MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); -#endif -#if TEMP_SENSOR_BED != 0 - MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); -#endif - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); + + menuitems_temperature_common(); MENU_END(); } From 228250f050ad8bd8bca4044ae27eb9cb57d43a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 24 Apr 2023 21:33:07 +0000 Subject: [PATCH 231/240] Cleanup: Remove next_feedrate from global scope No change in memory --- Firmware/Marlin_main.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ce66afc25..d866549a2 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -283,9 +283,6 @@ static float offset[3] = {0.0, 0.0, 0.0}; // Current feedrate float feedrate = 1500.0; -// Feedrate for the next move -static float next_feedrate; - // Original feedrate saved during homing moves static float saved_feedrate; @@ -9138,8 +9135,8 @@ void get_coordinates() { else destination[i] = current_position[i]; //Are these else lines really needed? } if(code_seen('F')) { - next_feedrate = code_value(); - if(next_feedrate > 0.0) feedrate = next_feedrate; + const float next_feedrate = code_value(); + if(next_feedrate > 0.f) feedrate = next_feedrate; } } From 686f92b243deab6350e46697a943e012b3a581b9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 25 Apr 2023 20:41:17 +0200 Subject: [PATCH 232/240] Move nozzle to center during Thermal model cal. --- Firmware/ultralcd.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2bfd7bd6..572edbeb0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -902,9 +902,24 @@ void lcd_commands() switch (lcd_commands_step) { case 0: - lcd_commands_step = 3; + lcd_commands_step = 6; [[fallthrough]]; + case 6: + enquecommand_P(G28W); + lcd_commands_step = 5; + break; + + case 5: + enquecommand_P(PSTR("G1 X125 Y105 Z1 F8000")); + lcd_commands_step = 4; + break; + + case 4: + st_synchronize(); + lcd_commands_step = 3; + break; + case 3: temp_model_set_warn_beep(false); enquecommand_P(PSTR("M310 A F1")); From e11555392ec19f14b3a14dccb9ad0ba8f92d6f8f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 26 Apr 2023 09:18:47 +0200 Subject: [PATCH 233/240] Save some bytes. Thanks to @leptun --- Firmware/ultralcd.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 572edbeb0..d03a89840 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -902,15 +902,11 @@ void lcd_commands() switch (lcd_commands_step) { case 0: - lcd_commands_step = 6; + lcd_commands_step = 5; [[fallthrough]]; - case 6: - enquecommand_P(G28W); - lcd_commands_step = 5; - break; - case 5: + enquecommand_P(G28W); enquecommand_P(PSTR("G1 X125 Y105 Z1 F8000")); lcd_commands_step = 4; break; From 0b34c6a69585128607819dd7893b9702594bdbf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 29 Apr 2023 10:24:04 +0000 Subject: [PATCH 234/240] cleanup: Remove unused LcdCommands state This may help the compiler generate smaller code Change in memory: Flash: -2 bytes SRAM: 0 bytes --- Firmware/ultralcd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index d9ef0ba81..541215853 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -113,7 +113,6 @@ extern void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType res enum class LcdCommands : uint_least8_t { Idle, - LoadFilament, StopPrint, LongPause, PidExtruder, From 26369ac540d6ef2a92198c0d4c48e5b2e775bc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 29 Apr 2023 16:22:28 +0000 Subject: [PATCH 235/240] Restore old M701/M702 behavior If the new Z parameter is not given, assume that the old Z-lift behavior is desired. Change in memory: Flash: -28 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 ++ Firmware/first_lay_cal.cpp | 4 ++-- Firmware/messages.cpp | 4 ++-- Firmware/messages.h | 4 ++-- Firmware/ultralcd.cpp | 11 +++++------ 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fdf8dca6d..35caf0e90 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8417,6 +8417,7 @@ Sigma_Exit: // Z lift. For safety only allow positive values if (code_seen('Z')) z_target = fabs(code_value()); + else raise_z_above(MIN_Z_FOR_LOAD); // backwards compatibility for 3.12 and older FW // Raise the Z axis float delta = raise_z(z_target); @@ -8447,6 +8448,7 @@ Sigma_Exit: // For safety only allow positive values if (code_seen('Z')) z_target = fabs(code_value()); + else raise_z_above(MIN_Z_FOR_UNLOAD); // backwards compatibility for 3.12 and older FW // Raise the Z axis float delta = raise_z(z_target); diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 0ad7ca5c9..65ceaf678 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -81,7 +81,7 @@ bool lay1cal_load_filament(uint8_t filament) return false; } else if( currentTool != (uint8_t)MMU2::FILAMENT_UNKNOWN){ // some other slot is loaded, perform an unload first - enquecommand_P(MSG_M702_NO_LIFT); + enquecommand_P(MSG_M702); } // perform a toolchange enquecommandf_P(PSTR("T%d"), filament); @@ -245,6 +245,6 @@ void lay1cal_finish(bool mmu_enabled) lay1cal_common_enqueue_loop(cmd_cal_finish, (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0]))); - if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle + if (mmu_enabled) enquecommand_P(MSG_M702); //unload from nozzle enquecommand_P(MSG_M84);// disable motors } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 3702feb10..f50e03bdb 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -240,5 +240,5 @@ const char MSG_M107[] PROGMEM_N1 = "M107"; const char MSG_M220[] PROGMEM_N1 = "M220 S%d"; const char MSG_M500[] PROGMEM_N1 = "M500"; const char MSG_M600[] PROGMEM_N1 = "M600"; -const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; -const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; +const char MSG_M701[] PROGMEM_N1 = "M701"; +const char MSG_M702[] PROGMEM_N1 = "M702"; diff --git a/Firmware/messages.h b/Firmware/messages.h index d7a1bc997..f074351d9 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -246,8 +246,8 @@ extern const char MSG_M107[]; extern const char MSG_M220[]; extern const char MSG_M500[]; extern const char MSG_M600[]; -extern const char MSG_M701_NO_LIFT[]; -extern const char MSG_M702_NO_LIFT[]; +extern const char MSG_M701[]; +extern const char MSG_M702[]; #if defined(__cplusplus) } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2bfd7bd6..715f3d6c1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1805,10 +1805,10 @@ switch(eFilamentAction) // FALLTHRU case FilamentAction::Load: loading_flag=true; - enquecommand_P(MSG_M701_NO_LIFT); // load filament + enquecommand_P(MSG_M701); // load filament break; case FilamentAction::UnLoad: - enquecommand_P(MSG_M702_NO_LIFT); // unload filament + enquecommand_P(MSG_M702); // unload filament break; case FilamentAction::MmuLoad: case FilamentAction::MmuLoadingTest: @@ -1868,11 +1868,11 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) { loading_flag = true; - enquecommand_P(MSG_M701_NO_LIFT); // load filament + enquecommand_P(MSG_M701); // load filament if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } if (eFilamentAction == FilamentAction::UnLoad) - enquecommand_P(MSG_M702_NO_LIFT); // unload filament + enquecommand_P(MSG_M702); // unload filament } break; case FilamentAction::MmuLoad: @@ -3717,8 +3717,7 @@ static void lcd_wizard_load() { lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT)); loading_flag = true; } - gcode_M701(FILAMENTCHANGE_FIRSTFEED, 0); - //enquecommand_P(MSG_M701_NO_LIFT); // is enqueuecommand_P safe here? + enquecommand_P(MSG_M701); } static void wizard_lay1cal_message(bool cold) From 92e5747469b85ac8a3661fa4faa1dd6f02f2456c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 29 Apr 2023 23:43:27 +0000 Subject: [PATCH 236/240] M600: remove dead code The if statement doesn't do anything useful so I propose it be removed before 3.13 release Change in memory: Flash: -30 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ce66afc25..b63637e52 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3524,12 +3524,6 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float MMU2::mmu2.eject_filament(MMU2::mmu2.get_current_tool(), false); } mmu_M600_wait_and_beep(); - if (saved_printing) { - lcd_clear(); - lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); -//@@TODO mmu_command(MmuCmd::R0); -// manage_response(false, false); - } } mmu_M600_load_filament(automatic, HotendTempBckp); } From b3f52f95c7892d7cb2b0683a9729c0a51845cb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 30 Apr 2023 23:31:16 +0000 Subject: [PATCH 237/240] optimisation: only check feedrate if knob is rotated Guard the feedmultiply code with lcd_encoder. if lcd_encoder = 0, then there is no need to check if feedmultiply should be updated. Also set lcd_encoder to zero in one line to consume the rotation event. Change in memory: Flash: -40 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 49 +++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2bfd7bd6..537feb8c9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -693,34 +693,29 @@ void lcd_status_screen() // NOT static due to using ins { static uint8_t lcd_status_update_delay = 0; #ifdef ULTIPANEL_FEEDMULTIPLY - // Dead zone at 100% feedrate - if ((feedmultiply < 100 && (feedmultiply + lcd_encoder) > 100) || - (feedmultiply > 100 && (feedmultiply + lcd_encoder) < 100)) - { - lcd_encoder = 0; - feedmultiply = 100; - } - if (feedmultiply == 100 && lcd_encoder > ENCODER_FEEDRATE_DEADZONE) - { - feedmultiply += lcd_encoder - ENCODER_FEEDRATE_DEADZONE; - lcd_encoder = 0; - } - else if (feedmultiply == 100 && lcd_encoder < -ENCODER_FEEDRATE_DEADZONE) - { - feedmultiply += lcd_encoder + ENCODER_FEEDRATE_DEADZONE; - lcd_encoder = 0; - } - else if (feedmultiply != 100) - { - feedmultiply += lcd_encoder; - lcd_encoder = 0; - } -#endif //ULTIPANEL_FEEDMULTIPLY + if (lcd_encoder) + { + const int16_t initial_feedmultiply = feedmultiply; + // Dead zone at 100% feedrate + if ((feedmultiply < 100 && (feedmultiply + lcd_encoder) > 100) || + (feedmultiply > 100 && (feedmultiply + lcd_encoder) < 100)) + { + feedmultiply = 100; + } + else if (feedmultiply == 100 && lcd_encoder > ENCODER_FEEDRATE_DEADZONE) { + feedmultiply += lcd_encoder - ENCODER_FEEDRATE_DEADZONE; + } + else if (feedmultiply == 100 && lcd_encoder < -ENCODER_FEEDRATE_DEADZONE) { + feedmultiply += lcd_encoder + ENCODER_FEEDRATE_DEADZONE; + } + else if (feedmultiply != 100) feedmultiply += lcd_encoder; - if (feedmultiply < 10) - feedmultiply = 10; - else if (feedmultiply > 999) - feedmultiply = 999; + if (initial_feedmultiply != feedmultiply) { + feedmultiply = constrain(feedmultiply, 10, 999); + lcd_encoder = 0; // Consume rotation event + } + } +#endif //ULTIPANEL_FEEDMULTIPLY if (lcd_draw_update) { // Update the status screen immediately From 5b75886a55ab558bb7b32c126e2c4726849df7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 1 May 2023 12:48:21 +0000 Subject: [PATCH 238/240] Fix regression where feedrate can overflow on status screen If the remaining print time is more than 10.9 hours at 100% then increasing the feedrate multiplier to 101% or more will yield an unrealistic time due to overflow occuring. Change in memory: Flash +2 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2bfd7bd6..4f3d6f7bd 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -446,9 +446,9 @@ void lcdui_print_time(void) //if remaining print time estimation is available print it else print elapsed time int chars = 0; if (printer_active()) { - uint16_t print_t = PRINT_TIME_REMAINING_INIT; - uint16_t print_tr = PRINT_TIME_REMAINING_INIT; - uint16_t print_tc = PRINT_TIME_REMAINING_INIT; + uint16_t print_t = PRINT_TIME_REMAINING_INIT; // unit: minutes + uint16_t print_tr = PRINT_TIME_REMAINING_INIT; // unit: minutes + uint16_t print_tc = PRINT_TIME_REMAINING_INIT; // unit: minutes char suff = ' '; char suff_doubt = ' '; @@ -491,7 +491,8 @@ void lcdui_print_time(void) if (feedmultiply != 100 && (print_t == print_tr || print_t == print_tc)) { suff_doubt = '?'; - print_t = (100 * print_t) / feedmultiply; + // (print_t * 100) overflows uint16_t at 10.9 hours, uint32_t is required + print_t = (uint16_t)((100UL * (uint32_t)print_t) / feedmultiply); } if (print_t < 6000) //time<100h From 9cf1f7871eafe7edca63eaff9e5cd76b38d8c4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 2 May 2023 22:32:18 +0000 Subject: [PATCH 239/240] Minor fix to M701 when MMU slot is out of range If MMU slot is outside of range, then we rather the printer not do anything. Currently it would accidentally assume the MMU is disabled. This may have undesireable results. No change in memory --- Firmware/Marlin_main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35caf0e90..5c8df63f8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3575,8 +3575,10 @@ void gcode_M701(float fastLoadLength, uint8_t mmuSlotIndex){ prusa_statistics(22); - if (MMU2::mmu2.Enabled() && mmuSlotIndex < MMU_FILAMENT_COUNT) { - MMU2::mmu2.load_filament_to_nozzle(mmuSlotIndex); + if (MMU2::mmu2.Enabled()) { + if (mmuSlotIndex < MMU_FILAMENT_COUNT) { + MMU2::mmu2.load_filament_to_nozzle(mmuSlotIndex); + } // else do nothing } else { custom_message_type = CustomMsg::FilamentLoading; lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); From fc15f5a6ef33a19f2f6c91e205ee98ce6059db6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 2 May 2023 22:38:54 +0000 Subject: [PATCH 240/240] Select correct MMU slot in lcd_wizard_load Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 715f3d6c1..91707eb8f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3717,7 +3717,9 @@ static void lcd_wizard_load() { lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT)); loading_flag = true; } - enquecommand_P(MSG_M701); + + // When MMU is disabled P parameter is ignored + enquecommand_P(PSTR("M701 P0")); } static void wizard_lay1cal_message(bool cold)