From 563009d9342ee983d6e9496592cf86b145b46050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20M=C3=BChl?= Date: Tue, 19 Mar 2019 10:49:14 +0100 Subject: [PATCH 001/104] Fix typo "misslung" is not a valid conjugation of "misslungen". The proper form is "misslang". --- lang/lang_en_de.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5e2198c7..fa556e9a 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1040,7 +1040,7 @@ #MSG_SELFTEST_FAILED c=20 r=0 "Selftest failed " -"Selbsttest misslung " +"Selbsttest misslang " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." From 367a28a5a8dd1c7fbc2308f953447194659584e9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 23 Apr 2019 20:24:04 +0200 Subject: [PATCH 002/104] Default to "Live Adjust Z" when longpressing during a print (closes #1604) - Disable longpress action when homing or calibrating - Default to Live Adjust during a print - Retain "Move Z" otherwise --- Firmware/ultralcd.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 48c408f9..3f7c6960 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8252,8 +8252,22 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { - move_menu_scale = 1.0; - menu_submenu(lcd_move_z); + if (homing_flag || mesh_bed_leveling_flag) + { + // disable longpress while homing or calibration + return; + } + + if (moves_planned() || IS_SD_PRINTING || is_usb_printing) + { + lcd_clear(); + menu_submenu(lcd_babystep_z); + } + else + { + move_menu_scale = 1.0; + menu_submenu(lcd_move_z); + } } void menu_lcd_charsetup_func(void) From 3a87ff56f678a4811679393eaf7ef61ce5ffa422 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 16 Jul 2019 21:15:58 +0200 Subject: [PATCH 003/104] Default to "Move Z" above a certain height even when printing This speeds-up the ability to manually get the carriage out of the way just after a print has finished --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3f7c6960..169a1f18 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8258,7 +8258,7 @@ void menu_lcd_longpress_func(void) return; } - if (moves_planned() || IS_SD_PRINTING || is_usb_printing) + if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) { lcd_clear(); menu_submenu(lcd_babystep_z); From 6860a572c2744a8f3519b470b3f86e0d98b90182 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 15:55:53 +0200 Subject: [PATCH 004/104] detection of faulty RAMBo (incorrect capacitor on fan tach pin) for MK3/S --- Firmware/Marlin_main.cpp | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7f2efe35..b5b0ad1e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3274,6 +3274,56 @@ static void gcode_PRUSA_SN() puts_P(_N("Not in farm mode.")); } } +//! Detection of faulty RAMBo 1.1b boards equipped with bigger capacitors +//! at the TACH_1 pin, which causes bad detection of print fan speed. +//! Warning: This function is not to be used by ordinary users, it is here only for automated testing purposes, +//! it may even interfere with other functions of the printer! You have been warned! +//! The test idea is to measure the time necessary to charge the capacitor. +//! So the algorithm is as follows: +//! 1. Set TACH_1 pin to INPUT mode and LOW +//! 2. Wait a few ms +//! 3. disable interrupts and measure the time until the TACH_1 pin reaches HIGH +//! Repeat 1.-3. several times +//! Good RAMBo's times are in the range of approx. 260-320 us +//! Bad RAMBo's times are approx. 260-1200 us +//! So basically we are interested in maximum time, the minima are mostly the same. +//! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality +static void gcode_PRUSA_BadRAMBoFanTest(){ + //printf_P(PSTR("Enter fan pin test\n")); +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 + fan_measuring = false; // prevent EXTINT7 breaking into the measurement + unsigned long tach1max = 0; + uint8_t tach1cntr = 0; + for( /* nothing */; tach1cntr < 100; ++tach1cntr){ + //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); + SET_OUTPUT(TACH_1); + WRITE(TACH_1, LOW); + delay2(20); // the delay may be lower + unsigned long tachMeasure = micros2(); + cli(); + SET_INPUT(TACH_1); + // just wait brutally in an endless cycle until we reach HIGH + // if this becomes a problem it may be improved to non-endless cycle + while( READ(TACH_1) == 0 ) ; + sei(); + tachMeasure = micros2() - tachMeasure; + if( tach1max < tachMeasure ) + tach1max = tachMeasure; + //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); + } + //printf_P(PSTR("TACH_1: max=%lu us\n"), tach1max); + SERIAL_PROTOCOLPGM("RAMBo FAN "); + if( tach1max > 500 ){ + // bad RAMBo + SERIAL_PROTOCOLLNPGM("BAD"); + } else { + SERIAL_PROTOCOLLNPGM("OK"); + } + // cleanup after the test function + SET_INPUT(TACH_1); + WRITE(TACH_1, HIGH); +#endif +} #ifdef BACKLASH_X extern uint8_t st_backlash_x; @@ -3559,6 +3609,8 @@ void process_commands() else if (code_seen("PRN")) { //! PRUSA PRN printf_P(_N("%d"), status_number); + } else if( code_seen("FANPINTST") ){ + gcode_PRUSA_BadRAMBoFanTest(); }else if (code_seen("FAN")) { //! PRUSA FAN printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); }else if (code_seen("fn")) { //! PRUSA fn From 593675c667ea6075df27412977a1ce54d589e589 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 16:40:21 +0200 Subject: [PATCH 005/104] delay, micros for the 3.7.x branch --- 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 b5b0ad1e..bdfb29d2 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3298,15 +3298,15 @@ static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); SET_OUTPUT(TACH_1); WRITE(TACH_1, LOW); - delay2(20); // the delay may be lower - unsigned long tachMeasure = micros2(); + delay(20); // the delay may be lower + unsigned long tachMeasure = micros(); cli(); SET_INPUT(TACH_1); // just wait brutally in an endless cycle until we reach HIGH // if this becomes a problem it may be improved to non-endless cycle while( READ(TACH_1) == 0 ) ; sei(); - tachMeasure = micros2() - tachMeasure; + tachMeasure = micros() - tachMeasure; if( tach1max < tachMeasure ) tach1max = tachMeasure; //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); From 3e60cf453752bf40b291ca1d0a9bd6b28b3746a7 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 23 Jul 2019 16:51:02 +0200 Subject: [PATCH 006/104] enable only for MK3S (out of FLASH on the MK3) --- 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 bdfb29d2..16a1b66b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3290,7 +3290,7 @@ static void gcode_PRUSA_SN() //! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("Enter fan pin test\n")); -#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 && defined(IR_SENSOR) fan_measuring = false; // prevent EXTINT7 breaking into the measurement unsigned long tach1max = 0; uint8_t tach1cntr = 0; From 3ddb853bbd6d485c92eeb71ac263b51fd3145fa2 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 26 Jul 2019 18:53:08 +0300 Subject: [PATCH 007/104] Fix shifted languages. Use \n and \x0a --- Firmware/lcd.cpp | 6 +++++- Firmware/ultralcd.cpp | 4 ++-- lang/fw-build.sh | 2 +- lang/fw-clean.sh | 2 +- lang/lang-add.sh | 2 +- lang/lang-check.sh | 2 +- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 8 ++++---- lang/lang_en_de.txt | 8 ++++---- lang/lang_en_es.txt | 8 ++++---- lang/lang_en_fr.txt | 8 ++++---- lang/lang_en_it.txt | 8 ++++---- lang/lang_en_pl.txt | 8 ++++---- lang/progmem.sh | 3 ++- 14 files changed, 39 insertions(+), 34 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 1f4e6e2f..fd3e1328 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -143,7 +143,7 @@ static void lcd_command(uint8_t value, uint16_t delayExtra = 0) static void lcd_write(uint8_t value) { - if (value == '\n' || value == '\r') + if (value == '\n') { if (lcd_currline > 3) lcd_currline = -1; lcd_set_cursor(0, lcd_currline + 1); // LF @@ -257,7 +257,9 @@ void lcd_no_display(void) lcd_displaycontrol &= ~LCD_DISPLAYON; lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); } +#endif +#ifdef VT100 //required functions for VT100 // Turns the underline cursor on/off void lcd_no_cursor(void) { @@ -270,7 +272,9 @@ void lcd_cursor(void) lcd_displaycontrol |= LCD_CURSORON; lcd_command(LCD_DISPLAYCONTROL | lcd_displaycontrol); } +#endif +#if 0 // Turn on and off the blinking cursor void lcd_no_blink(void) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d726769..acb369d9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4344,7 +4344,7 @@ static void lcd_crash_mode_info() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("Crash detection can\rbe turned on only in\rNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 + fputs_P(_i("Crash detection can\nbe turned on only in\nNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 tim = _millis(); } menu_back_if_clicked(); @@ -4357,7 +4357,7 @@ static void lcd_crash_mode_info2() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("WARNING:\rCrash detection\rdisabled in\rStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 + fputs_P(_i("WARNING:\nCrash detection\ndisabled in\nStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 tim = _millis(); } menu_back_if_clicked(); diff --git a/lang/fw-build.sh b/lang/fw-build.sh index a6ac5879..98187bef 100755 --- a/lang/fw-build.sh +++ b/lang/fw-build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # postbuild.sh - multi-language support script # Generate binary with secondary language. diff --git a/lang/fw-clean.sh b/lang/fw-clean.sh index df7e4962..2acd4d18 100755 --- a/lang/fw-clean.sh +++ b/lang/fw-clean.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # fw-clean.sh - multi-language support script # Remove all firmware output files from lang folder. diff --git a/lang/lang-add.sh b/lang/lang-add.sh index d33eacd9..f8031e19 100755 --- a/lang/lang-add.sh +++ b/lang/lang-add.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-add.sh - multi-language support script # add new texts from list (lang_add.txt) to all dictionary files diff --git a/lang/lang-check.sh b/lang/lang-check.sh index 3d73d460..c363cdc0 100755 --- a/lang/lang-check.sh +++ b/lang/lang-check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang_check.sh - multi-language support script # check lang_xx.bin (language binary file) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c8d35cce..2da37fc0 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -8,10 +8,10 @@ "[0;0] point offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" +"Crash detection can\x0abe turned on only in\x0aNormal mode" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" # ">Cancel" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d4606d56..ed682e81 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -11,12 +11,12 @@ "[0;0] odsazeni bodu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Crash detekce muze\rbyt zapnuta pouze v\rNormal modu" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"POZOR:\rCrash detekce\rdeaktivovana ve\rStealth modu" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # ">Cancel" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3c2c8a14..1d33f0f1 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -11,12 +11,12 @@ "[0;0] Punktversatz" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Crash Erkennung kann\rnur im Modus Normal\rgenutzt werden" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"WARNUNG:\rCrash Erkennung\rdeaktiviert im\rStealth Modus" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # ">Cancel" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3f4629e9..a48da96f 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -11,12 +11,12 @@ "[0;0] punto offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Dec. choque\rpuede ser activada solo en\rModo normal" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Dec. choque puede\x0aser activada solo en\x0aModo normal" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATENCION:\rDec. choque\rdesactivada en\rModo silencio" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # ">Cancel" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 2919f11f..320b91d9 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -11,12 +11,12 @@ "Offset point [0;0]" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"La detection de crash peut etre\ractive seulement\ren mode Normal" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATTENTION :\rDetection de crash\r desactivee en\rmode Furtif" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" # ">Cancel" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0726fef2..0b82c587 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -11,12 +11,12 @@ "[0;0] punto offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Rilev. impatto\rattivabile solo\rin Modalita normale" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"ATTENZIONE:\rRilev. impatto\rdisattivato in\rModalita silenziosa" +"WARNING:\x0aCrash detection disabled in Stealth mode" +"ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # ">Cancel" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 6919d057..47e0fbb0 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -11,12 +11,12 @@ "[0;0] przesuniecie punktu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -"Crash detection can\rbe turned on only in\rNormal mode" -"Wykrywanie zderzen moze\rbyc wlaczone tylko w\rtrybie Normalnym" +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\rCrash detection\rdisabled in\rStealth mode" -"UWAGA:\rWykrywanie zderzen\rwylaczone w\rtrybie Stealth" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +"UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # ">Cancel" diff --git a/lang/progmem.sh b/lang/progmem.sh index 3e413025..53993b28 100755 --- a/lang/progmem.sh +++ b/lang/progmem.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # progmem.sh - multi-language support script # Examine content of progmem sections (default is progmem1). @@ -104,6 +104,7 @@ cat $PROGMEM.chr | \ sed 's/\\x1b/\\\\\\x1b/g;' | \ sed 's/\\x01/\\\\\\x01/g;' | \ sed 's/\\xf8/\\\\\\xf8/g;' | \ + sed 's/\\x0a/\\\\\\x0a/g;' | \ sed 's/\\x00$/\n/;s/^/\"/;s/$/\"\\/'; \ ) | sh > $PROGMEM.var From 952a24b45d6cb215473eba8dffd24e1f6580cac5 Mon Sep 17 00:00:00 2001 From: Keith Spitz Date: Sun, 28 Jul 2019 19:40:18 -0600 Subject: [PATCH 008/104] Update util.cpp Correct "is_whitespace_or_nl": change 'r' to '\r'. --- Firmware/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 05cbf994..f0912605 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -27,7 +27,7 @@ const char STR_REVISION_RC [] PROGMEM = "rc"; inline bool is_whitespace_or_nl(char c) { - return c == ' ' || c == '\t' || c == '\n' || c == 'r'; + return c == ' ' || c == '\t' || c == '\n' || c == '\r'; } inline bool is_whitespace_or_nl_or_eol(char c) From 0aed59c947360b2ddba73a3e02a036eb70308b58 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 30 Jul 2019 19:06:57 +0200 Subject: [PATCH 009/104] Fix unsigned char overflow cause invalid filament load. --- Firmware/mmu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 21ce96d7..d6e533df 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -978,7 +978,7 @@ void extr_adj(uint8_t extruder) //loading filament for SNMM { #ifndef SNMM MmuCmd cmd = MmuCmd::L0 + extruder; - if (cmd > MmuCmd::L4) + if (extruder > (MmuCmd::L4 - MmuCmd::L0)) { printf_P(PSTR("Filament out of range %d \n"),extruder); return; From bca0fd81eb6971909aee6a0c4305926e16c381e3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 30 Jul 2019 19:15:33 +0200 Subject: [PATCH 010/104] Fix loading filament 255 instead of 0 in first layer calibration wizard. --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index acb369d9..6b388054 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4798,6 +4798,7 @@ static void lcd_wizard_load() if (mmu_enabled) { lcd_show_fullscreen_message_and_wait_P(_i("Please insert PLA filament to the first tube of MMU, then press the knob to load it."));////c=20 r=8 + tmp_extruder = 0; } else { From 49d2866b48648cc4c5b283f47301aef512fa28b2 Mon Sep 17 00:00:00 2001 From: Simon Benoit Date: Tue, 23 Jul 2019 21:20:37 -0400 Subject: [PATCH 011/104] Add threshold distance to Z calibration Add missing if statement --- Firmware/Marlin_main.cpp | 3 ++- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 ++- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 ++- 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 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35722679..ea1eb66d 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2876,7 +2876,8 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #endif //TMC2130 enable_endstops(endstops_enabled); - if (st_get_position_mm(Z_AXIS) == MESH_HOME_Z_SEARCH) + if ((st_get_position_mm(Z_AXIS) <= (MESH_HOME_Z_SEARCH + HOME_Z_SEARCH_THRESHOLD)) || + (st_get_position_mm(Z_AXIS) >= (MESH_HOME_Z_SEARCH - HOME_Z_SEARCH_THRESHOLD))) { if (onlyZ) { diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 442e8b94..05657f05 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -257,7 +257,8 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 44fee01e..887ef97a 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -256,7 +256,8 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index a979503a..5bdf3ac9 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -314,7 +314,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index bb897fd7..80285141 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -315,7 +315,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 8425dfd7..0c1518ad 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -314,7 +314,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 525c2206..d783c10f 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -315,7 +315,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 8b843095..0b96724d 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -422,7 +422,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 5f1009a5..1c408db8 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -424,7 +424,8 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. +#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 2cb977e4a0dea57e07c13c910170fa0fca020ec8 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Wed, 31 Jul 2019 20:39:57 +0200 Subject: [PATCH 012/104] UI update --- Firmware/util.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index f8ad87d4..7ae4df30 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -424,13 +424,13 @@ switch(oCheckModel) { case ClCheckModel::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("Printer model differs from the G-code. Continue?")); +lcd_display_message_fullscreen_P(_i("G-code sliced for a different printer type. Continue?")); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Please check the value in settings. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); lcd_print_stop(); break; } @@ -471,13 +471,13 @@ switch(oCheckVersion) { case ClCheckVersion::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer FW version differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("Printer FW version differs from the G-code. Continue?")); +lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?")); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery break; case ClCheckVersion::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("Printer FW version differs from the G-code. Please check the value in settings. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled.")); lcd_print_stop(); break; } @@ -501,13 +501,13 @@ switch(oCheckGcode) { case ClCheckGcode::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("Printer G-code level differs from the G-code. Continue?")); +lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?")); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery break; case ClCheckGcode::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled.")); lcd_print_stop(); break; } @@ -564,13 +564,13 @@ switch(oCheckModel) { case ClCheckModel::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("Printer model differs from the G-code. Continue?")); +lcd_display_message_fullscreen_P(_i("G-code sliced for a different printer type. Continue?")); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Please check the value in settings. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); lcd_print_stop(); break; } From 7c9d3dd177c44e470136699b2957087ea4e4ed12 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 1 Aug 2019 13:09:20 +0200 Subject: [PATCH 013/104] Update doxydoc of new G-codes --- Firmware/Marlin_main.cpp | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35722679..a24f7876 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3607,7 +3607,9 @@ void process_commands() - `Lz` - `Beat` - Kick farm link timer - `FR` - Full factory reset - - `nozzle D` - set nozzle diameter (farm mode only), e.g. `PRUSA nozzle set 0.4` + - `nozzle D` - check the nozzle diameter (farm mode only), works like M862.1 P, e.g. `PRUSA nozzle D0.4` + - `nozzle` - prints nozzle diameter (farm mode only), works like M862.1 P, e.g. `PRUSA nozzle` * */ @@ -7305,21 +7307,34 @@ Sigma_Exit: // ---------------------------------------------- /*! Checks the parameters of the printer and gcode and performs compatibility check - - M862.1 [ P | Q ] - - M862.2 [ P | Q ] - - M862.3 [ P | Q ] - - M862.4 [ P | Q] - - M862.5 [ P | Q] - - When run with P<> argument, the check is performed against the input value. - When run with Q argument, the current value is shown. - + When run with P<> argument, the check is performed against the input value. + When run with Q argument, the current value is shown. + + M862.3 accepts text identifiers of printer types too. + The syntax of M862.3 is (note the space between P and the printer type name and the quotes around the type): + + M862.3 P "MK3S" + + Accepted printer type identifiers and their numeric counterparts: + - MK1 (100) + - MK2 (200) + - MK2MM (201) + - MK2S (202) + - MK2SMM (203) + - MK2.5 (250) + - MK2.5MMU2 (20250) + - MK2.5S (252) + - MK2.5SMMU2S (20252) + - MK3 (300) + - MK3MMU2 (20300) + - MK3S (302) + - MK3SMMU2S (20302) */ case 862: // M862: print checking float nDummy; From 15a095ea760798b15c28fa4c880aad96dbb097a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BChn?= Date: Sat, 3 Aug 2019 15:37:11 +0200 Subject: [PATCH 014/104] changed blind sound --- Firmware/sound.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp index b01285a5..9a91739b 100644 --- a/Firmware/sound.cpp +++ b/Firmware/sound.cpp @@ -135,10 +135,15 @@ switch(eSoundMode) static void Sound_DoSound_Blind_Alert(void) { - _tone(BEEPER,300); - _delay_ms(75); - _noTone(BEEPER); - _delay_ms(75); + uint8_t nI; + + for(nI=0; nI<50; nI++) + { + WRITE(BEEPER,HIGH); + delayMicroseconds(94); + WRITE(BEEPER,LOW); + delayMicroseconds(94); + } } static void Sound_DoSound_Encoder_Move(void) From 5f14e9c2e58199d6ad07a4fe0859f3911d2fcd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BChn?= Date: Sat, 3 Aug 2019 17:35:39 +0200 Subject: [PATCH 015/104] Removed sheet setting when in farm mode --- Firmware/ultralcd.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6b388054..fd448050 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5511,10 +5511,6 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_BEGIN(); MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu); -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu); -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); - //strncpy(buffer,_i("Sheet"),sizeof(buffer)); //strncpy(buffer,_i(" "),sizeof(buffer)); //strncpy(buffer,EEPROM_Sheets_base->s[0].name,sizeof(buffer)); @@ -5533,9 +5529,14 @@ MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); //delete(b); -if(!farm_mode){ - SETTINGS_NOZZLE; - MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); +if(!farm_mode) +{ + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); + + SETTINGS_NOZZLE; + MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); } MENU_END(); } @@ -6746,7 +6747,10 @@ static void lcd_main_menu() if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) { - MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); + if (!farm_mode) + { + MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); + } } if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) From cb19f0958b5716f255c0a150b7e67a7673f48c80 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 5 Aug 2019 09:51:06 +0200 Subject: [PATCH 016/104] Use _delay() and _micros() for future compatibility --- 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 16a1b66b..0df61045 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3298,15 +3298,15 @@ static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("TACH_1: %d\n"), tach1cntr); SET_OUTPUT(TACH_1); WRITE(TACH_1, LOW); - delay(20); // the delay may be lower - unsigned long tachMeasure = micros(); + _delay(20); // the delay may be lower + unsigned long tachMeasure = _micros(); cli(); SET_INPUT(TACH_1); // just wait brutally in an endless cycle until we reach HIGH // if this becomes a problem it may be improved to non-endless cycle while( READ(TACH_1) == 0 ) ; sei(); - tachMeasure = micros() - tachMeasure; + tachMeasure = _micros() - tachMeasure; if( tach1max < tachMeasure ) tach1max = tachMeasure; //printf_P(PSTR("TACH_1: %d: capacitor check time=%lu us\n"), (int)tach1cntr, tachMeasure); From f1a947af2cbd3b2d2de6a283bb717812d3d81ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BChn?= Date: Mon, 5 Aug 2019 10:40:21 +0200 Subject: [PATCH 017/104] Whole hw settings hidden in farm mode --- Firmware/ultralcd.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index fd448050..3bd451ed 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5529,15 +5529,13 @@ MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item //delete(b); -if(!farm_mode) -{ - MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu); - MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu); - MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); +MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu); +MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu); +MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); + +SETTINGS_NOZZLE; +MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); - SETTINGS_NOZZLE; - MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); -} MENU_END(); } @@ -5566,9 +5564,12 @@ static void lcd_settings_menu() SETTINGS_SILENT_MODE; - bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function - MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP - + if(!farm_mode) + { + bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function + MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP + } + SETTINGS_MMU_MODE; MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1 From f77414be2bd84ea10f5994402725220dbf57f66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BChn?= Date: Mon, 5 Aug 2019 12:41:27 +0200 Subject: [PATCH 018/104] blind alert sound shorter --- Firmware/sound.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp index 9a91739b..52d880a0 100644 --- a/Firmware/sound.cpp +++ b/Firmware/sound.cpp @@ -137,7 +137,7 @@ static void Sound_DoSound_Blind_Alert(void) { uint8_t nI; - for(nI=0; nI<50; nI++) + for(nI=0; nI<20; nI++) { WRITE(BEEPER,HIGH); delayMicroseconds(94); From 091cd49ca5466302916f9b85b5a1013a50517a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20K=C3=BChn?= Date: Mon, 5 Aug 2019 16:59:09 +0200 Subject: [PATCH 019/104] Fw version check disabled in farm mode --- 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 a24f7876..0cb5a496 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1509,8 +1509,10 @@ void setup() #ifndef DEBUG_DISABLE_STARTMSGS KEEPALIVE_STATE(PAUSED_FOR_USER); - check_if_fw_is_on_right_printer(); - show_fw_version_warnings(); + if (!farm_mode) { + check_if_fw_is_on_right_printer(); + show_fw_version_warnings(); + } switch (hw_changed) { //if motherboard or printer type was changed inform user as it can indicate flashing wrong firmware version From b471bb7540f11508d18d5c498793513b3232a8ec Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Mon, 5 Aug 2019 17:51:26 +0200 Subject: [PATCH 020/104] farm mode update, documentation correction --- Firmware/Marlin_main.cpp | 12 ++++++------ Firmware/util.cpp | 7 +++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a24f7876..4197c863 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7307,17 +7307,17 @@ Sigma_Exit: // ---------------------------------------------- /*! Checks the parameters of the printer and gcode and performs compatibility check - - M862.1 [ P | Q ] - - M862.2 [ P | Q ] - - M862.3 [ P | Q ] - - M862.4 [ P | Q] - - M862.5 [ P | Q] + - M862.1 { P | Q } + - M862.2 { P | Q } + - M862.3 { P"" | Q } + - M862.4 { P | Q } + - M862.5 { P | Q } When run with P<> argument, the check is performed against the input value. When run with Q argument, the current value is shown. M862.3 accepts text identifiers of printer types too. - The syntax of M862.3 is (note the space between P and the printer type name and the quotes around the type): + The syntax of M862.3 is (note the quotes around the type): M862.3 P "MK3S" diff --git a/Firmware/util.cpp b/Firmware/util.cpp index cc8d7850..aa1a624d 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -401,8 +401,11 @@ lcd_update_enable(true); // display / status-line recovery case ClCheckMode::_Undef: break; } -bSettings=false; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function -menu_submenu(lcd_hw_setup_menu); +if(!farm_mode) + { + bSettings=false; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function + menu_submenu(lcd_hw_setup_menu); + } } void printer_model_check(uint16_t nPrinterModel) From 33037d369cf35fb0ea8d962bb9c8d26df9dfd561 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 5 Aug 2019 18:22:56 +0200 Subject: [PATCH 021/104] Prevent LCD long-press re-entry (fixes #1196) --- Firmware/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 169a1f18..7e96fcc8 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8252,9 +8252,10 @@ uint8_t get_message_level() void menu_lcd_longpress_func(void) { - if (homing_flag || mesh_bed_leveling_flag) + if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) { - // disable longpress while homing or calibration + // disable longpress during re-entry, while homing or calibration + lcd_quick_feedback(); return; } From 7da2ee5fc3bd1e40847bbddbf101aff781637a5d Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 6 Aug 2019 15:37:23 +0200 Subject: [PATCH 022/104] Version changed (3.7.3 build 2370) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index acdadfe7..4cd69697 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -7,8 +7,8 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_VERSION "3.7.2" -#define FW_COMMIT_NR 2363 +#define FW_VERSION "3.7.3" +#define FW_COMMIT_NR 2370 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN From d9dec38815badd55e9acc02a3c7a434ffc4662de Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 7 Aug 2019 17:23:19 +0200 Subject: [PATCH 023/104] Workaround for the "viper" situation bug. --- Firmware/ultralcd.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3bd451ed..ac8a302f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4853,9 +4853,21 @@ void lcd_wizard(WizState state) int wizard_event; const char *msg = NULL; while (!end) { - printf_P(PSTR("Wizard state: %d"), state); + printf_P(PSTR("Wizard state: %d\n"), state); switch (state) { case S::Run: //Run wizard? + + // 2019-08-07 brutal hack - solving the "viper" situation. + // It is caused by the fact, that tmc2130_st_isr makes a crash detection before the printers really starts. + // And thus it calles stop_and_save_print_to_ram which sets the saved_printing flag. + // Having this flag set during normal printing is lethal - mesh_plan_buffer_line exist in the middle of planning long travels + // which results in distorted print. + // This primarily happens when the printer is new and parked in 0,0 + // So any new printer will fail the first layer calibration unless being reset or the Stop function gets called. + // We really must find a way to prevent the crash from happening before the printer is started - that would be the correct solution. + // Btw. the flag may even trigger the viper situation on normal start this way and the user won't be able to find out why. + saved_printing = false; + wizard_active = true; wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"), false, true);////MSG_WIZARD_WELCOME c=20 r=7 if (wizard_event) { From 2ddbd606f2e9a803a0eac396698e14655e9879c9 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 8 Aug 2019 16:44:16 +0200 Subject: [PATCH 024/104] Version changed (3.8.0 build 2608) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7a782d71..870eee89 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -16,8 +16,8 @@ extern uint16_t nPrinterType; extern PGM_P sPrinterName; // Firmware version -#define FW_VERSION "3.7.2" -#define FW_COMMIT_NR 2363 +#define FW_VERSION "3.8.0" +#define FW_COMMIT_NR 2608 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN From dc78bc7362be3236ad8d63c261a48d99fc4388c8 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 14 Aug 2019 17:53:08 +0200 Subject: [PATCH 025/104] Improve performance of bed PWM automaton - proof of concept There are still some artefacts on the output pin - work in progress. --- Firmware/heatbed_pwm.cpp | 215 ++++++++++++++++++++++++++------------- Firmware/timer02.c | 2 +- 2 files changed, 144 insertions(+), 73 deletions(-) diff --git a/Firmware/heatbed_pwm.cpp b/Firmware/heatbed_pwm.cpp index 8a913b63..a3e5444c 100755 --- a/Firmware/heatbed_pwm.cpp +++ b/Firmware/heatbed_pwm.cpp @@ -19,91 +19,162 @@ // So the automaton runs atop of inner 8 (or 16) cycles. // The finite automaton is running in the ISR(TIMER0_OVF_vect) +// 2019-08-14 update: the original algorithm worked very well, however there were 2 regressions: +// 1. 62kHz ISR requires considerable amount of processing power, +// USB transfer speed dropped by 20%, which was most notable when doing short G-code segments. +// 2. Some users reported TLed PSU started clicking when running at 120V/60Hz. +// This looks like the original algorithm didn't maintain base PWM 30Hz, but only 15Hz +// To address both issues, there is an improved approach based on the idea of leveraging +// different CLK prescalers in some automaton states - i.e. when holding LOW or HIGH on the output pin, +// we don't have to clock 62kHz, but we can increase the CLK prescaler for these states to 8 (or even 64). +// That shall result in the ISR not being called that much resulting in regained performance +// Theoretically this is relatively easy, however one must be very carefull handling the AVR's timer +// control registers correctly, especially setting them in a correct order. +// Some registers are double buffered, some changes are applied in next cycles etc. +// The biggest problem was with the CLK prescaler itself - this circuit is shared among almost all timers, +// we don't want to reset the prescaler counted value when transiting among automaton states. +// Resetting the prescaler would make the PWM more precise, right now there are temporal segments +// of variable period ranging from 0 to 7 62kHz ticks - that's logical, the timer must "sync" +// to the new slower CLK after setting the slower prescaler value. +// In our application, this isn't any significant problem and may be ignored. +// Doing changes in timer's registers non-correctly results in artefacts on the output pin +// - it can toggle unnoticed, which will result in bed clicking again. +// That's why there are special transition states ZERO_TO_RISE and ONE_TO_FALL, which enable the +// counter change its operation atomically and without artefacts on the output pin. +// The resulting signal on the output pin was checked with an osciloscope. +// If there are any change requirements in the future, the signal must be checked with an osciloscope again, +// ad-hoc changes may completely screw things up! + ///! Definition off finite automaton states enum class States : uint8_t { - ZERO = 0, - RISE = 1, - ONE = 2, - FALL = 3 -}; - -///! State table for the inner part of the finite automaton -///! Basically it specifies what shall happen if the outer automaton is requesting setting the heat pin to 0 (OFF) or 1 (ON) -///! ZERO: steady 0 (OFF), no change for the whole period -///! RISE: 8 (16) fast PWM cycles with increasing duty up to steady ON -///! ONE: steady 1 (ON), no change for the whole period -///! FALL: 8 (16) fast PWM cycles with decreasing duty down to steady OFF -///! @@TODO move it into progmem -static States stateTable[4*2] = { -// off on -States::ZERO, States::RISE, // ZERO -States::FALL, States::ONE, // RISE -States::FALL, States::ONE, // ONE -States::ZERO, States::RISE // FALL + ZERO_START = 0,///< entry point of the automaton - reads the soft_pwm_bed value for the next whole PWM cycle + ZERO, ///< steady 0 (OFF), no change for the whole period + ZERO_TO_RISE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin + RISE, ///< 16 fast PWM cycles with increasing duty up to steady ON + RISE_TO_ONE, ///< metastate allowing the timer change its state atomically without artefacts on the output pin + ONE, ///< steady 1 (ON), no change for the whole period + ONE_TO_FALL, ///< metastate allowing the timer change its state atomically without artefacts on the output pin + FALL, ///< 16 fast PWM cycles with decreasing duty down to steady OFF + FALL_TO_ZERO ///< metastate allowing the timer change its state atomically without artefacts on the output pin }; ///! Inner states of the finite automaton -static States state = States::ZERO; +static States state = States::ZERO_START; -///! Inner and outer PWM counters -static uint8_t outer = 0; -static uint8_t inner = 0; +///! Fast PWM counter is used in the RISE and FALL states (62.5kHz) +static uint8_t slowCounter = 0; +///! Slow PWM counter is used in the ZERO and ONE states (62.5kHz/8 or 64) +static uint8_t fastCounter = 0; +///! PWM counter for the whole cycle - a cache for soft_pwm_bed static uint8_t pwm = 0; -///! the slow PWM duty for the next 30Hz cycle +///! The slow PWM duty for the next 30Hz cycle ///! Set in the whole firmware at various places extern unsigned char soft_pwm_bed; -/// Fine tuning of automaton cycles -#if 1 -static const uint8_t innerMax = 16; -static const uint8_t innerShift = 4; -#else -static const uint8_t innerMax = 8; -static const uint8_t innerShift = 5; -#endif +/// fastMax - how many fast PWM steps to do in RISE and FALL states +/// 16 is a good compromise between silenced bed ("smooth" edges) +/// and not burning the switching MOSFET +static const uint8_t fastMax = 16; + +/// Scaler 16->256 for fast PWM +static const uint8_t fastShift = 4; + +/// Increment slow PWM counter by slowInc every ZERO or ONE state +/// This allows for fine-tuning the basic PWM switching frequency +/// A possible further optimization - use a 64 prescaler (instead of 8) +/// increment slowCounter by 1 +/// but use less bits of soft PWM - something like soft_pwm_bed >> 2 +/// that may further reduce the CPU cycles required by the bed heating automaton +/// Due to the nature of bed heating the reduced PID precision may not be a major issue, however doing 8x less ISR(timer0_ovf) may significantly improve the performance +static const uint8_t slowInc = 1; ISR(TIMER0_OVF_vect) // timer compare interrupt service routine { - if( inner ){ - switch(state){ - case States::ZERO: - OCR0B = 255; - // Commenting the following code saves 6B, but it is left here for reference - // It is not necessary to set it all over again, because we can only get into the ZERO state from the FALL state (which sets this register) -// TCCR0A |= (1 << COM0B1) | (1 << COM0B0); - break; - case States::RISE: - OCR0B = (innerMax - inner) << innerShift; -// TCCR0A |= (1 << COM0B1); // this bit is always 1 - TCCR0A &= ~(1 << COM0B0); - break; - case States::ONE: - OCR0B = 255; - // again - may be skipped, because we get into the ONE state only from RISE (which sets this register) -// TCCR0A |= (1 << COM0B1); - TCCR0A &= ~(1 << COM0B0); - break; - case States::FALL: - OCR0B = (innerMax - inner) << innerShift; // this is the same as in RISE, because now we are setting the zero part of duty due to inverting mode - // must switch to inverting mode already here, because it takes a whole PWM cycle and it would make a "1" at the end of this pwm cycle - TCCR0A |= /*(1 << COM0B1) |*/ (1 << COM0B0); - break; + switch(state){ + case States::ZERO_START: + pwm = soft_pwm_bed << 1;// expecting soft_pwm_bed to be 7bit! + if( pwm != 0 ){ + state = States::ZERO; // do nothing, let it tick once again after the 30Hz period + } + break; + case States::ZERO: // end of state ZERO - we'll either stay in ZERO or change to RISE + // In any case update our cache of pwm value for the next whole cycle from soft_pwm_bed + slowCounter += slowInc; // this does software timer_clk/256 or less (depends on slowInc) + if( slowCounter > pwm ){ + return; + } // otherwise moving towards RISE + state = States::ZERO_TO_RISE; // and finalize the change in a transitional state RISE0 + break; + // even though it may look like the ZERO state may be glued together with the ZERO_TO_RISE, don't do it + // the timer must tick once more in order to get rid of occasional output pin toggles. + case States::ZERO_TO_RISE: // special state for handling transition between prescalers and switching inverted->non-inverted fast-PWM without toggling the output pin. + // It must be done in consequent steps, otherwise the pin will get flipped up and down during one PWM cycle. + // Also beware of the correct sequence of the following timer control registers initialization - it really matters! + state = States::RISE; // prepare for standard RISE cycles + fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE + TCNT0 = 255; // force overflow on the next clock cycle + TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz + TCCR0A &= ~(1 << COM0B0); // Clear OC0B on Compare Match, set OC0B at BOTTOM (non-inverting mode) + break; + case States::RISE: + OCR0B = (fastMax - fastCounter) << fastShift; + if( fastCounter ){ + --fastCounter; + } else { // end of RISE cycles, changing into state ONE + state = States::RISE_TO_ONE; + OCR0B = 255; // full duty + TCNT0 = 254; // make the timer overflow in the next cycle + // @@TODO these constants are still subject to investigation + } + break; + case States::RISE_TO_ONE: + state = States::ONE; + OCR0B = 255; // full duty + TCNT0 = 255; // make the timer overflow in the next cycle + TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz + break; + case States::ONE: // state ONE - we'll either stay in ONE or change to FALL + OCR0B = 255; + slowCounter += slowInc; // this does software timer_clk/256 or less + if( slowCounter < pwm ){ + return; + } + if( (soft_pwm_bed << 1) >= (255 - slowInc - 1) ){ //@@TODO simplify & explain + // if slowInc==2, soft_pwm == 251 will be the first to do short drops to zero. 252 will keep full heating + return; // want full duty for the next ONE cycle again - so keep on heating and just wait for the next timer ovf + } + // otherwise moving towards FALL + // @@TODO it looks like ONE_TO_FALL isn't necessary, there are no artefacts at all + state = States::ONE;//_TO_FALL; +// TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz +// break; +// case States::ONE_TO_FALL: +// OCR0B = 255; // zero duty + state=States::FALL; + fastCounter = fastMax - 1;// we'll do 16-1 cycles of RISE + TCNT0 = 255; // force overflow on the next clock cycle + TCCR0B = (1 << CS00); // change prescaler to 1, i.e. 62.5kHz + // must switch to inverting mode already here, because it takes a whole PWM cycle and it would make a "1" at the end of this pwm cycle + // COM0B1 remains set both in inverting and non-inverting mode + TCCR0A |= (1 << COM0B0); // inverting mode + break; + case States::FALL: + OCR0B = (fastMax - fastCounter) << fastShift; // this is the same as in RISE, because now we are setting the zero part of duty due to inverting mode + //TCCR0A |= (1 << COM0B0); // already set in ONE_TO_FALL + if( fastCounter ){ + --fastCounter; + } else { // end of FALL cycles, changing into state ZERO + state = States::FALL_TO_ZERO; + TCNT0 = 128; //@@TODO again - need to wait long enough to propagate the timer state changes + OCR0B = 255; + } + break; + case States::FALL_TO_ZERO: + state = States::ZERO_START; // go to read new soft_pwm_bed value for the next cycle + TCNT0 = 128; + OCR0B = 255; + TCCR0B = (1 << CS01); // change prescaler to 8, i.e. 7.8kHz + break; } - --inner; - } else { - if( ! outer ){ // at the end of 30Hz PWM period - // synchro is not needed (almost), soft_pwm_bed is just 1 byte, 1-byte write instruction is atomic - pwm = soft_pwm_bed << 1; - } - if( pwm > outer || pwm >= 254 ){ - // soft_pwm_bed has a range of 0-127, that why a <<1 is done here. That also means that we may get only up to 254 which we want to be full-time 1 (ON) - state = stateTable[ uint8_t(state) * 2 + 1 ]; - } else { - // switch OFF - state = stateTable[ uint8_t(state) * 2 + 0 ]; - } - ++outer; - inner = innerMax; - } } diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 6b6cbe2c..e2f696c9 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -26,7 +26,7 @@ void timer0_init(void) OCR0B = 255; // Set fast PWM mode and inverting mode. TCCR0A = (1 << WGM01) | (1 << WGM00) | (1 << COM0B1) | (1 << COM0B0); - TCCR0B = (1 << CS00); // no clock prescaling + TCCR0B = (1 << CS01); // CLK/8 prescaling TIMSK0 |= (1 << TOIE0); // enable timer overflow interrupt // Everything, that used to be on timer0 was moved to timer2 (delay, beeping, millis etc.) From 36a69281ee0debe814a71598126b003ce64159f5 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:36:05 +0200 Subject: [PATCH 026/104] Remove unused functions forward declarations. --- Firmware/ultralcd.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ac8a302f..d8290a50 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -120,14 +120,7 @@ static void lcd_tune_menu(); //static void lcd_move_menu(); static void lcd_settings_menu(); static void lcd_calibration_menu(); -#ifdef LINEARITY_CORRECTION -static void lcd_settings_menu_back(); -#endif //LINEARITY_CORRECTION static void lcd_control_temperature_menu(); -static void lcd_control_temperature_preheat_pla_settings_menu(); -static void lcd_control_temperature_preheat_abs_settings_menu(); -static void lcd_control_motion_menu(); -static void lcd_control_volumetric_menu(); static void lcd_settings_linearity_correction_menu_save(); static void prusa_stat_printerstatus(int _status); static void prusa_stat_farm_number(); From eb68bb9b43d7e6ce582c399466ae20c25a28fa46 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:46:29 +0200 Subject: [PATCH 027/104] Add ASA preheat. --- Firmware/ultralcd.cpp | 11 +++++++++++ Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 6 +++++- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 4 ++++ Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 4 ++++ 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 | 4 ++++ Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 4 ++++ 9 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d8290a50..33a4257e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1697,6 +1697,16 @@ void lcd_preheat_pla() if (wizard_active) lcd_wizard(WizState::Unload); } +void lcd_preheat_asa() +{ + setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); + if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); + fanSpeed = ASA_PREHEAT_FAN_SPEED; + lcd_return_to_status(); + setWatch(); // heater sanity check timer + if (wizard_active) lcd_wizard(WizState::Unload); +} + void lcd_preheat_abs() { setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); @@ -2030,6 +2040,7 @@ static void lcd_preheat_menu() } else { MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); + MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_pet); MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); MENU_ITEM_FUNCTION_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); MENU_ITEM_FUNCTION_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 442e8b94..2539e82c 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -324,7 +324,11 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 55 -#define PLA_PREHEAT_FAN_SPEED 0 +#define PLA_PREHEAT_FAN_SPEED 0 + +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 44fee01e..fbbc332d 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -325,6 +325,10 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HPB_TEMP 55 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index a979503a..d0d0341c 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -383,6 +383,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index bb897fd7..c931b7db 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -384,6 +384,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 8425dfd7..c5df948c 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -383,6 +383,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 525c2206..cc2498d6 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -384,6 +384,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b3828ce5..b2b26617 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -493,6 +493,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 5f1009a5..5736b632 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -495,6 +495,10 @@ #define PLA_PREHEAT_HPB_TEMP 60 #define PLA_PREHEAT_FAN_SPEED 0 +#define ASA_PREHEAT_HOTEND_TEMP 260 +#define ASA_PREHEAT_HPB_TEMP 105 +#define ASA_PREHEAT_FAN_SPEED 0 + #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 #define ABS_PREHEAT_FAN_SPEED 0 From a6f955b62dabbbb2d83827ab8b28115ee2104aa9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:47:34 +0200 Subject: [PATCH 028/104] Use unused macros *_PREHEAT_FAN_SPEED. --- Firmware/ultralcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 33a4257e..4b422a11 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1691,7 +1691,7 @@ void lcd_preheat_pla() { setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = PLA_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1711,7 +1711,7 @@ void lcd_preheat_abs() { setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = ABS_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1721,7 +1721,7 @@ void lcd_preheat_pp() { setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = PP_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1731,7 +1731,7 @@ void lcd_preheat_pet() { setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = PET_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1741,7 +1741,7 @@ void lcd_preheat_hips() { setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = HIPS_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1751,7 +1751,7 @@ void lcd_preheat_flex() { setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); - fanSpeed = 0; + fanSpeed = FLEX_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); From 0b798767aff8e429ea10d2cb86cfa8a184e8b9e4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:54:23 +0200 Subject: [PATCH 029/104] Fix preheat ASA. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4b422a11..2bf1d3b4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2040,7 +2040,7 @@ static void lcd_preheat_menu() } else { MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); - MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_pet); + MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_asa); MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); MENU_ITEM_FUNCTION_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); MENU_ITEM_FUNCTION_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); From b10bd8340a609e70537218c2346e43d84a9f5c6c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 15 Aug 2019 17:57:30 +0200 Subject: [PATCH 030/104] Make local functions static. --- Firmware/ultralcd.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2bf1d3b4..de56ea02 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1669,7 +1669,7 @@ static void lcd_move_menu_axis(); /* Menu implementation */ -void lcd_preheat_farm() +static void lcd_preheat_farm() { setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); setTargetBed(FARM_PREHEAT_HPB_TEMP); @@ -1678,7 +1678,7 @@ void lcd_preheat_farm() setWatch(); // heater sanity check timer } -void lcd_preheat_farm_nozzle() +static void lcd_preheat_farm_nozzle() { setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); setTargetBed(0); @@ -1687,7 +1687,7 @@ void lcd_preheat_farm_nozzle() setWatch(); // heater sanity check timer } -void lcd_preheat_pla() +static void lcd_preheat_pla() { setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); @@ -1697,7 +1697,7 @@ void lcd_preheat_pla() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_asa() +static void lcd_preheat_asa() { setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); @@ -1707,7 +1707,7 @@ void lcd_preheat_asa() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_abs() +static void lcd_preheat_abs() { setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); @@ -1717,7 +1717,7 @@ void lcd_preheat_abs() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_pp() +static void lcd_preheat_pp() { setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); @@ -1727,7 +1727,7 @@ void lcd_preheat_pp() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_pet() +static void lcd_preheat_pet() { setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); @@ -1737,7 +1737,7 @@ void lcd_preheat_pet() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_hips() +static void lcd_preheat_hips() { setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); @@ -1747,7 +1747,7 @@ void lcd_preheat_hips() if (wizard_active) lcd_wizard(WizState::Unload); } -void lcd_preheat_flex() +static void lcd_preheat_flex() { setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); @@ -1758,7 +1758,7 @@ void lcd_preheat_flex() } -void lcd_cooldown() +static void lcd_cooldown() { setAllTargetHotends(0); setTargetBed(0); From 1036c4f7556d0d67ad644d590c7b7db53589898d Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 16 Aug 2019 19:00:45 +0200 Subject: [PATCH 031/104] Do not precede first layer calibration without filament if print is paused due to MMU load failed. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index de56ea02..16830f87 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1354,7 +1354,7 @@ void lcd_commands() 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()) + if (!blocks_queued() && cmd_buffer_empty() && !saved_printing) { switch(lcd_commands_step) { From e53734895f414330f81a62b2695c9f1a416af39f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 16 Aug 2019 20:20:17 +0200 Subject: [PATCH 032/104] Make MMU load failed blocking to workaround lack of resume print menu item. The same workaround used as for USB print (Octoprint). --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/mmu.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 483d3018..64f8ce74 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7768,7 +7768,7 @@ Sigma_Exit: if (mmu_enabled) { st_synchronize(); - mmu_continue_loading(is_usb_printing); + mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)); mmu_extruder = tmp_extruder; //filament change is finished mmu_load_to_nozzle(); } @@ -7812,7 +7812,7 @@ Sigma_Exit: #endif //defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); - mmu_continue_loading(is_usb_printing); + mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)); mmu_extruder = tmp_extruder; //filament change is finished diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index d6e533df..2c81a6e8 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -889,7 +889,7 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp) mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(false, true, MMU_LOAD_MOVE); - mmu_continue_loading(is_usb_printing); + mmu_continue_loading(is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)); mmu_extruder = tmp_extruder; //filament change is finished mmu_load_to_nozzle(); From 170c1ea86648856e2a9f82b8f2669fc035a9267f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 16 Aug 2019 20:47:55 +0200 Subject: [PATCH 033/104] Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved. --- Firmware/first_lay_cal.cpp | 33 ++++++++++++++++++--------------- Firmware/first_lay_cal.h | 3 ++- Firmware/ultralcd.cpp | 18 +++++++++++------- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index bfec021f..3ab34c41 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -40,15 +40,26 @@ void lay1cal_preheat() } -//! @brief Print intro line +//! @brief Load filament //! @param cmd_buffer character buffer needed to format gcodes //! @param filament filament to use (applies for MMU only) -void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) +void lay1cal_load_filament(char *cmd_buffer, uint8_t filament) { - static const char cmd_intro_mmu_0[] PROGMEM = "M83"; - static const char cmd_intro_mmu_1[] PROGMEM = "G1 Y-3.0 F1000.0"; - static const char cmd_intro_mmu_2[] PROGMEM = "G1 Z0.4 F1000.0"; - static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; // call T code before + if (mmu_enabled) + { + enquecommand_P(PSTR("M83")); + enquecommand_P(PSTR("G1 Y-3.0 F1000.0")); + enquecommand_P(PSTR("G1 Z0.4 F1000.0")); + sprintf_P(cmd_buffer, PSTR("T%d"), filament); + enquecommand(cmd_buffer); + } + +} + +//! @brief Print intro line +void lay1cal_intro_line() +{ + static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0"; static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0"; static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0"; @@ -61,10 +72,7 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) static const char * const intro_mmu_cmd[] PROGMEM = { - cmd_intro_mmu_0, - cmd_intro_mmu_1, - cmd_intro_mmu_2, - cmd_intro_mmu_3, // call T code before + cmd_intro_mmu_3, cmd_intro_mmu_4, cmd_intro_mmu_5, cmd_intro_mmu_6, @@ -80,11 +88,6 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) { for (uint8_t i = 0; i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i) { - if (3 == i) - { - sprintf_P(cmd_buffer, PSTR("T%d"), filament); - enquecommand(cmd_buffer); - } enquecommand_P(static_cast(pgm_read_ptr(&intro_mmu_cmd[i]))); } } diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 1f338cc5..a52bef76 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -7,7 +7,8 @@ #include void lay1cal_preheat(); -void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); +void lay1cal_load_filament(char *cmd_buffer, uint8_t filament); +void lay1cal_intro_line(); void lay1cal_before_meander(); void lay1cal_meander(char *cmd_buffer); void lay1cal_square(char *cmd_buffer, uint8_t i); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 16830f87..66bdc764 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1359,37 +1359,41 @@ void lcd_commands() switch(lcd_commands_step) { case 0: - lcd_commands_step = 10; + lcd_commands_step = 11; break; case 20: filament = 0; - lcd_commands_step = 10; + lcd_commands_step = 11; break; case 21: filament = 1; - lcd_commands_step = 10; + lcd_commands_step = 11; break; case 22: filament = 2; - lcd_commands_step = 10; + lcd_commands_step = 11; break; case 23: filament = 3; - lcd_commands_step = 10; + lcd_commands_step = 11; break; case 24: filament = 4; + lcd_commands_step = 11; + break; + case 11: + lay1cal_preheat(); lcd_commands_step = 10; break; case 10: - lay1cal_preheat(); + lay1cal_load_filament(cmd1, filament); lcd_commands_step = 9; break; case 9: lcd_clear(); menu_depth = 0; menu_submenu(lcd_babystep_z); - lay1cal_intro_line(cmd1, filament); + lay1cal_intro_line(); lcd_commands_step = 8; break; case 8: From f0642f88f19798b899f47692bc2b008d99ce2190 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 19 Aug 2019 17:37:23 +0200 Subject: [PATCH 034/104] Fix power panic broken when PSU_Delta defined. Remove disable_z() call from uvlo_() and uvlo_tiny() power panic interrupt handlers. As historically this function was empty. And in case PSU_Delta macro defined it switches Z trinamic to silent mode, which could take some time and is not needed. Remove alignment to to full step from disable_force_z(), as it is not needed when switching to silent mode. --- Firmware/Marlin_main.cpp | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 483d3018..faffd520 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9607,7 +9607,6 @@ void uvlo_() st_synchronize(); disable_e0(); - disable_z(); // Move Z up to the next 0th full step. // Write the file position. eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), sd_position); @@ -9646,8 +9645,6 @@ void uvlo_() st_synchronize(); printf_P(_N("stps%d\n"), tmc2130_rd_MSCNT(Z_AXIS)); - - disable_z(); // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); @@ -9686,7 +9683,6 @@ tmc2130_set_current_r(Z_AXIS, 20); z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); #endif //TMC2130 planner_abort_hard(); -disable_z(); //save current position only in case, where the printer is moving on Z axis, which is only when EEPROM_UVLO is 1 //EEPROM_UVLO is 1 after normal uvlo or after recover_print(), when the extruder is moving on Z axis after rehome @@ -10534,34 +10530,20 @@ if(!(bEnableForce_z||eeprom_read_byte((uint8_t*)EEPROM_SILENT))) void disable_force_z() { -uint16_t z_microsteps=0; + uint16_t z_microsteps=0; -if(!bEnableForce_z) - return; // motor already disabled (may be ;-p ) -bEnableForce_z=false; + if(!bEnableForce_z) return; // motor already disabled (may be ;-p ) -// alignment to full-step + bEnableForce_z=false; + + // switching to silent mode #ifdef TMC2130 -z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); -#endif // TMC2130 -planner_abort_hard(); -sei(); -plan_buffer_line( - current_position[X_AXIS], - current_position[Y_AXIS], - current_position[Z_AXIS]+float((1024-z_microsteps+7)>>4)/cs.axis_steps_per_unit[Z_AXIS], - current_position[E_AXIS], - 40, active_extruder); -st_synchronize(); - -// switching to silent mode -#ifdef TMC2130 -tmc2130_mode=TMC2130_MODE_SILENT; -update_mode_profile(); -tmc2130_init(true); + tmc2130_mode=TMC2130_MODE_SILENT; + update_mode_profile(); + tmc2130_init(true); #endif // TMC2130 -axis_known_position[Z_AXIS]=false; + axis_known_position[Z_AXIS]=false; } From f204cdea81903e365d7c45333bbb4efa3ae6c63c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 20 Aug 2019 17:22:27 +0200 Subject: [PATCH 035/104] Refactor Remove variable CrashDetectMenu. Read this state from EEPROM_CRASH_DET instead in bool lcd_crash_detect_enabled(). Rename crashdet_enable() to lcd_crash_detect_enable() and move it to ultralcd.cpp. Rename crashdet_disable() to lcd_crash_detect_disable() and move it to ultralcd.cpp. Rename lcd_crash_mode_set() to crash_mode_switch(). Remove forward function declarations from *.cpp file. Saves 34B of FLASH and 2B of RAM. --- Firmware/Marlin_main.cpp | 26 +++--------------- Firmware/ultralcd.cpp | 59 ++++++++++++++++++++++++++-------------- Firmware/ultralcd.h | 5 ++++ 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f4f92fee..0083c9ee 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -524,24 +524,6 @@ bool fans_check_enabled = true; #ifdef TMC2130 -extern int8_t CrashDetectMenu; - -void crashdet_enable() -{ - tmc2130_sg_stop_on_crash = true; - eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0xFF); - CrashDetectMenu = 1; - -} - -void crashdet_disable() -{ - tmc2130_sg_stop_on_crash = false; - tmc2130_sg_crash = 0; - eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00); - CrashDetectMenu = 0; -} - void crashdet_stop_and_save_print() { stop_and_save_print_to_ram(10, -default_retraction); //XY - no change, Z 10mm up, E -1mm retract @@ -1262,15 +1244,15 @@ void setup() uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silentMode == 0xff) silentMode = 0; tmc2130_mode = TMC2130_MODE_NORMAL; - uint8_t crashdet = eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET); - if (crashdet && !farm_mode) + + if (lcd_crash_detect_enabled() && !farm_mode) { - crashdet_enable(); + lcd_crash_detect_enable(); puts_P(_N("CrashDetect ENABLED!")); } else { - crashdet_disable(); + lcd_crash_detect_disable(); puts_P(_N("CrashDetect DISABLED")); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 66bdc764..c20350aa 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -58,17 +58,9 @@ uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode int8_t FSensorStateMenu = 1; -int8_t CrashDetectMenu = 1; - - extern bool fsensor_enable(); extern void fsensor_disable(); -#ifdef TMC2130 -extern void crashdet_enable(); -extern void crashdet_disable(); -#endif //TMC2130 - #ifdef SDCARD_SORT_ALPHA bool presort_flag = false; @@ -4448,24 +4440,25 @@ static void lcd_silent_mode_set() { #endif //TMC2130 st_current_init(); #ifdef TMC2130 - if (CrashDetectMenu && (SilentModeMenu != SILENT_MODE_NORMAL)) + if (lcd_crash_detect_enabled() && (SilentModeMenu != SILENT_MODE_NORMAL)) menu_submenu(lcd_crash_mode_info2); lcd_encoder_diff=0; // reset 'encoder buffer' #endif //TMC2130 } #ifdef TMC2130 -static void lcd_crash_mode_set() +static void crash_mode_switch() { - CrashDetectMenu = !CrashDetectMenu; //set also from crashdet_enable() and crashdet_disable() - if (CrashDetectMenu==0) { - crashdet_disable(); - }else{ - crashdet_enable(); + if (lcd_crash_detect_enabled()) + { + lcd_crash_detect_disable(); + } + else + { + lcd_crash_detect_enable(); } if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) menu_goto(lcd_tune_menu, 9, true, true); else menu_goto(lcd_settings_menu, 9, true, true); - } #endif //TMC2130 @@ -5179,11 +5172,11 @@ do\ else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ - if (CrashDetectMenu == 0)\ + if (lcd_crash_detect_enabled())\ {\ - MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), lcd_crash_mode_set);\ + MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch);\ }\ - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), lcd_crash_mode_set);\ + else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch);\ }\ else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info);\ }\ @@ -6903,8 +6896,8 @@ static void lcd_tune_menu() if (SilentModeMenu == SILENT_MODE_NORMAL) { - if (CrashDetectMenu == 0) MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), lcd_crash_mode_set); - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), lcd_crash_mode_set); + if (lcd_crash_detect_enabled()) MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch); + else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch); } else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info); } @@ -8645,3 +8638,27 @@ void menu_lcd_lcdupdate_func(void) lcd_send_status(); if (lcd_commands_type == LcdCommands::Layer1Cal) lcd_commands(); } + +#ifdef TMC2130 +//! @brief Is crash detection enabled? +//! +//! @retval true crash detection enabled +//! @retval false crash detection disabled +bool lcd_crash_detect_enabled() +{ + return eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET); +} + +void lcd_crash_detect_enable() +{ + tmc2130_sg_stop_on_crash = true; + eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0xFF); +} + +void lcd_crash_detect_disable() +{ + tmc2130_sg_stop_on_crash = false; + tmc2130_sg_crash = 0; + eeprom_update_byte((uint8_t*)EEPROM_CRASH_DET, 0x00); +} +#endif diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 2c57c944..f414a1cc 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -53,6 +53,11 @@ void lcd_menu_statistics(); void lcd_menu_extruder_info(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") +#ifdef TMC2130 +bool lcd_crash_detect_enabled(); +void lcd_crash_detect_enable(); +void lcd_crash_detect_disable(); +#endif extern const char* lcd_display_message_fullscreen_P(const char *msg, uint8_t &nlines); extern const char* lcd_display_message_fullscreen_P(const char *msg); From 3ed6d0637c748c3190b686de213de30843952d19 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 20 Aug 2019 17:34:42 +0200 Subject: [PATCH 036/104] Re-enable tmc2130_sg_stop_on_crash only if crash detection enabled from menu. This fixes bug, that disabling crash detection from menu doesn't work during recovery from crash detection. --- 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 0083c9ee..a8c67969 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -613,7 +613,7 @@ void crashdet_detected(uint8_t mask) void crashdet_recover() { crashdet_restore_print_and_continue(); - tmc2130_sg_stop_on_crash = true; + if (lcd_crash_detect_enabled()) tmc2130_sg_stop_on_crash = true; } void crashdet_cancel() From a7c2aec04c226297461866b1452166cdf007d5c6 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 21 Aug 2019 09:59:51 +0200 Subject: [PATCH 037/104] Code size reduced by almost 5KB --- Firmware/Marlin_main.cpp | 187 +++++++++++++++--------------- Firmware/mesh_bed_calibration.cpp | 4 +- Firmware/mmu.cpp | 64 +++++----- Firmware/planner.cpp | 6 +- Firmware/planner.h | 9 +- Firmware/ultralcd.cpp | 54 ++++----- 6 files changed, 163 insertions(+), 161 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f4f92fee..d4c2fdb1 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2025,14 +2025,14 @@ static void do_blocking_move_to(float x, float y, float z) { feedrate = homing_feedrate[Z_AXIS]; current_position[Z_AXIS] = z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder); + plan_buffer_line_curposXYZE(feedrate/60, active_extruder); st_synchronize(); feedrate = XY_TRAVEL_SPEED; current_position[X_AXIS] = x; current_position[Y_AXIS] = y; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate/60, active_extruder); + plan_buffer_line_curposXYZE(feedrate/60, active_extruder); st_synchronize(); feedrate = oldFeedRate; @@ -2362,77 +2362,77 @@ void ramming() { max_feedrate[E_AXIS] = 50; //current_position[E_AXIS] -= 8; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2100 / 60, active_extruder); + //plan_buffer_line_curposXYZE(2100 / 60, active_extruder); //current_position[E_AXIS] += 8; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2100 / 60, active_extruder); + //plan_buffer_line_curposXYZE(2100 / 60, active_extruder); current_position[E_AXIS] += 5.4; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2800 / 60, active_extruder); + plan_buffer_line_curposXYZE(2800 / 60, active_extruder); current_position[E_AXIS] += 3.2; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[E_AXIS] += 3; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3400 / 60, active_extruder); + plan_buffer_line_curposXYZE(3400 / 60, active_extruder); st_synchronize(); max_feedrate[E_AXIS] = 80; current_position[E_AXIS] -= 82; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 9500 / 60, active_extruder); + plan_buffer_line_curposXYZE(9500 / 60, active_extruder); max_feedrate[E_AXIS] = 50;//tmp[E_AXIS]; current_position[E_AXIS] -= 20; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1200 / 60, active_extruder); + plan_buffer_line_curposXYZE(1200 / 60, active_extruder); current_position[E_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); + plan_buffer_line_curposXYZE(400 / 60, active_extruder); current_position[E_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] -= 10; st_synchronize(); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] += 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] -= 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 800 / 60, active_extruder); + plan_buffer_line_curposXYZE(800 / 60, active_extruder); current_position[E_AXIS] += 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 800 / 60, active_extruder); + plan_buffer_line_curposXYZE(800 / 60, active_extruder); current_position[E_AXIS] -= 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 800 / 60, active_extruder); + plan_buffer_line_curposXYZE(800 / 60, active_extruder); st_synchronize(); } else { //ABS max_feedrate[E_AXIS] = 50; //current_position[E_AXIS] -= 8; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2100 / 60, active_extruder); + //plan_buffer_line_curposXYZE(2100 / 60, active_extruder); //current_position[E_AXIS] += 8; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2100 / 60, active_extruder); + //plan_buffer_line_curposXYZE(2100 / 60, active_extruder); current_position[E_AXIS] += 3.1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2000 / 60, active_extruder); + plan_buffer_line_curposXYZE(2000 / 60, active_extruder); current_position[E_AXIS] += 3.1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2500 / 60, active_extruder); + plan_buffer_line_curposXYZE(2500 / 60, active_extruder); current_position[E_AXIS] += 4; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); //current_position[X_AXIS] += 23; //delay - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600/60, active_extruder); //delay + //plan_buffer_line_curposXYZE(600/60, active_extruder); //delay //current_position[X_AXIS] -= 23; //delay - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600/60, active_extruder); //delay + //plan_buffer_line_curposXYZE(600/60, active_extruder); //delay _delay(4700); max_feedrate[E_AXIS] = 80; current_position[E_AXIS] -= 92; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 9900 / 60, active_extruder); + plan_buffer_line_curposXYZE(9900 / 60, active_extruder); max_feedrate[E_AXIS] = 50;//tmp[E_AXIS]; current_position[E_AXIS] -= 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 800 / 60, active_extruder); + plan_buffer_line_curposXYZE(800 / 60, active_extruder); current_position[E_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); + plan_buffer_line_curposXYZE(400 / 60, active_extruder); current_position[E_AXIS] -= 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); st_synchronize(); current_position[E_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] -= 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); current_position[E_AXIS] -= 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); + plan_buffer_line_curposXYZE(600 / 60, active_extruder); st_synchronize(); } @@ -2491,7 +2491,7 @@ static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, lon if (home_all_axes) { current_position[Z_AXIS] += MESH_HOME_Z_SEARCH; feedrate = homing_feedrate[Z_AXIS]; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); st_synchronize(); } #ifdef ENABLE_AUTO_BED_LEVELING @@ -2809,7 +2809,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) enable_endstops(false); current_position[X_AXIS] += 5; current_position[Y_AXIS] += 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); // Let the user move the Z axes up to the end stoppers. @@ -2859,7 +2859,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) bool endstops_enabled = enable_endstops(false); current_position[Z_AXIS] -= 1; //move 1mm down with disabled endstop - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); // Move the print head close to the bed. @@ -2870,7 +2870,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) tmc2130_home_enter(Z_AXIS_MASK); #endif //TMC2130 - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); #ifdef TMC2130 @@ -2910,7 +2910,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) clean_up_after_endstop_move(l_feedmultiply); // Print head up. current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); //#ifndef NEW_XYZCAL if (result >= 0) @@ -2930,7 +2930,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) clean_up_after_endstop_move(l_feedmultiply); // Print head up. current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); // if (result >= 0) babystep_apply(); #endif //HEATBED_V2 @@ -3040,21 +3040,18 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float //Retract E current_position[E_AXIS] += e_shift; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_RFEED, active_extruder); st_synchronize(); //Lift Z current_position[Z_AXIS] += z_shift; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], FILAMENTCHANGE_ZFEED, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_ZFEED, active_extruder); st_synchronize(); //Move XY to side current_position[X_AXIS] = x_position; current_position[Y_AXIS] = y_position; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_XYFEED, active_extruder); st_synchronize(); //Beep, manage nozzle heater and wait for user to start unload filament @@ -3079,8 +3076,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); current_position[X_AXIS] -= 100; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], FILAMENTCHANGE_XYFEED, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_XYFEED, active_extruder); st_synchronize(); lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4 } @@ -3117,8 +3113,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float if (!automatic) { current_position[E_AXIS] += FILAMENTCHANGE_RECFEED; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_EXFEED, active_extruder); } //Move XY back @@ -3185,12 +3180,12 @@ void gcode_M701() lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); current_position[E_AXIS] += 40; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); //fast sequence + plan_buffer_line_curposXYZE(400 / 60, active_extruder); //fast sequence st_synchronize(); marlin_rise_z(); current_position[E_AXIS] += 30; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); //fast sequence + plan_buffer_line_curposXYZE(400 / 60, active_extruder); //fast sequence load_filament_final_feed(); //slow sequence st_synchronize(); @@ -4389,15 +4384,15 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) if (result) { current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[Z_AXIS] = 50; current_position[Y_AXIS] = 180; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); lcd_show_fullscreen_message_and_wait_P(_T(MSG_REMOVE_STEEL_SHEET)); current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + 1); current_position[X_AXIS] = pgm_read_float(bed_ref_points_4); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); gcode_G28(false, false, true); @@ -4405,7 +4400,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) if ((current_temperature_pinda > 35) && (farm_mode == false)) { //waiting for PIDNA probe to cool down in case that we are not in farm mode current_position[Z_AXIS] = 100; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); if (lcd_wait_for_pinda(35) == false) { //waiting for PINDA probe to cool, if this takes more then time expected, temp. cal. fails lcd_temp_cal_show_result(false); break; @@ -4429,12 +4424,12 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) custom_message_state = 1; lcd_setstatuspgm(_T(MSG_TEMP_CALIBRATION)); current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = PINDA_PREHEAT_X; current_position[Y_AXIS] = PINDA_PREHEAT_Y; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[Z_AXIS] = PINDA_PREHEAT_Z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); while (current_temperature_pinda < start_temp) @@ -4446,10 +4441,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 0); //invalidate temp. calibration in case that in will be aborted during the calibration process current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = pgm_read_float(bed_ref_points_4); current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + 1); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); bool find_z_result = find_bed_induction_sensor_point_z(-1.f); @@ -4477,12 +4472,12 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) setTargetBed(50 + 10 * (temp - 30) / 5); // setTargetHotend(255, 0); current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = PINDA_PREHEAT_X; current_position[Y_AXIS] = PINDA_PREHEAT_Y; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[Z_AXIS] = PINDA_PREHEAT_Z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); while (current_temperature_pinda < temp) { @@ -4490,10 +4485,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) serialecho_temperatures(); } current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = pgm_read_float(bed_ref_points_4); current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + 1); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); find_z_result = find_bed_induction_sensor_point_z(-1.f); if (find_z_result == false) { @@ -4533,7 +4528,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) current_position[X_AXIS] = PINDA_PREHEAT_X; current_position[Y_AXIS] = PINDA_PREHEAT_Y; current_position[Z_AXIS] = PINDA_PREHEAT_Z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); while (abs(degBed() - PINDA_MIN_T) > 1) { @@ -4549,11 +4544,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) eeprom_update_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 0); //invalidate temp. calibration in case that in will be aborted during the calibration process current_position[Z_AXIS] = 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = BED_X0; current_position[Y_AXIS] = BED_Y0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); find_bed_induction_sensor_point_z(-1.f); @@ -4570,7 +4565,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) current_position[X_AXIS] = PINDA_PREHEAT_X; current_position[Y_AXIS] = PINDA_PREHEAT_Y; current_position[Z_AXIS] = PINDA_PREHEAT_Z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); while (degBed() < t_c) { delay_keep_alive(1000); @@ -4581,10 +4576,10 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) serialecho_temperatures(); } current_position[Z_AXIS] = 5; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[X_AXIS] = BED_X0; current_position[Y_AXIS] = BED_Y0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); find_bed_induction_sensor_point_z(-1.f); z_shift = (int)((current_position[Z_AXIS] - zero_z)*cs.axis_steps_per_unit[Z_AXIS]); @@ -4725,7 +4720,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // Cycle through all points and probe them // First move up. During this first movement, the babystepping will be reverted. current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60, active_extruder); // The move to the first calibration point. current_position[X_AXIS] = BED_X0; current_position[Y_AXIS] = BED_Y0; @@ -4740,7 +4735,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); #endif //SUPPORT_VERBOSITY - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[X_AXIS] / 30, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[X_AXIS] / 30, active_extruder); // Wait until the move is finished. st_synchronize(); @@ -4792,7 +4787,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) if((ix == 0) && (iy == 0)) current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; else current_position[Z_AXIS] += 2.f / nMeasPoints; //use relative movement from Z coordinate where PINDa triggered on previous point. This makes calibration faster. float init_z_bckp = current_position[Z_AXIS]; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); // Move to XY position of the sensor point. @@ -4813,7 +4808,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) #endif // SUPPORT_VERBOSITY //printf_P(PSTR("after clamping: [%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], XY_AXIS_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(XY_AXIS_FEEDRATE, active_extruder); st_synchronize(); // Go down until endstop is hit @@ -4825,7 +4820,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) if (init_z_bckp - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. //printf_P(PSTR("Another attempt! Current Z position: %f\n"), current_position[Z_AXIS]); current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point @@ -4880,7 +4875,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) MYSERIAL.print(current_position[Z_AXIS], 5); } #endif // SUPPORT_VERBOSITY - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); if (mesh_point != nMeasPoints * nMeasPoints) { Sound_MakeSound(e_SOUND_TYPE_StandardAlert); @@ -4897,14 +4892,14 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // ~ Z-homing (can not be used "G28", because X & Y-homing would have been done before (Z-homing)) bState=enable_z_endstop(false); current_position[Z_AXIS] -= 1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); enable_z_endstop(true); #ifdef TMC2130 tmc2130_home_enter(Z_AXIS_MASK); #endif // TMC2130 current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40, active_extruder); st_synchronize(); #ifdef TMC2130 tmc2130_home_exit(); @@ -5037,7 +5032,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) //unretract (after PINDA preheat retraction) if (degHotend(active_extruder) > EXTRUDE_MINTEMP && temp_cal_active == true && calibration_status_pinda() == true && target_temperature_bed >= 50) { current_position[E_AXIS] += default_retraction; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400, active_extruder); + plan_buffer_line_curposXYZE(400, active_extruder); } KEEPALIVE_STATE(NOT_BUSY); // Restore custom message state @@ -9022,7 +9017,7 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi card.openFile(filename_wldsd, false); /*destination[Z_AXIS] = mesh_home_z_search; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + //plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); for(int8_t i=0; i < NUM_AXIS; i++) { @@ -9056,7 +9051,7 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi if (iy & 1) ix = (x_points_num - 1) - ix; // Zig zag float z0 = 0.f; /*destination[Z_AXIS] = mesh_home_z_search; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + //plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); for(int8_t i=0; i < NUM_AXIS; i++) { @@ -9220,7 +9215,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ card.openFile(filename_wldsd, false); current_position[Z_AXIS] = mesh_home_z_search; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60, active_extruder); int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20; int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; @@ -9245,14 +9240,14 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ if (iy & 1) ix = (x_points_num - 1) - ix; // Zig zag float z0 = 0.f; current_position[Z_AXIS] = mesh_home_z_search; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); current_position[X_AXIS] = 13.f + ix * (x_dimension / (x_points_num - 1)) - bed_zero_ref_x + shift_x; current_position[Y_AXIS] = 6.4f + iy * (y_dimension / (y_points_num - 1)) - bed_zero_ref_y + shift_y; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], XY_AXIS_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(XY_AXIS_FEEDRATE, active_extruder); st_synchronize(); if (!find_bed_induction_sensor_point_z(-10.f)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point @@ -9366,12 +9361,12 @@ void temp_compensation_start() { if (degHotend(active_extruder) > EXTRUDE_MINTEMP) { current_position[E_AXIS] -= default_retraction; } - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400, active_extruder); + plan_buffer_line_curposXYZE(400, active_extruder); current_position[X_AXIS] = PINDA_PREHEAT_X; current_position[Y_AXIS] = PINDA_PREHEAT_Y; current_position[Z_AXIS] = PINDA_PREHEAT_Z; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); st_synchronize(); while (fabs(degBed() - target_temperature_bed) > 1) delay_keep_alive(1000); @@ -9492,17 +9487,17 @@ void long_pause() //long pause print //retract current_position[E_AXIS] -= default_retraction; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400, active_extruder); + plan_buffer_line_curposXYZE(400, active_extruder); //lift z current_position[Z_AXIS] += Z_PAUSE_LIFT; if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); + plan_buffer_line_curposXYZE(15, active_extruder); //Move XY to side current_position[X_AXIS] = X_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); // Turn off the print fan fanSpeed = 0; @@ -9654,7 +9649,7 @@ void uvlo_() #if 0 // Move the print head to the side of the print until all the power stored in the power supply capacitors is depleted. current_position[X_AXIS] = (current_position[X_AXIS] < 0.5f * (X_MIN_POS + X_MAX_POS)) ? X_MIN_POS : X_MAX_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 500, active_extruder); + plan_buffer_line_curposXYZE(500, active_extruder); st_synchronize(); #endif wdt_enable(WDTO_500MS); @@ -10290,7 +10285,7 @@ static void print_time_remaining_init() void load_filament_final_feed() { current_position[E_AXIS]+= FILAMENTCHANGE_FINALFEED; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FINAL, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FINAL, active_extruder); } //! @brief Wait for user to check the state @@ -10420,22 +10415,22 @@ void M600_load_filament_movements() do { current_position[E_AXIS] += 0.002; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 500, active_extruder); + plan_buffer_line_curposXYZE(500, active_extruder); delay_keep_alive(2); } while (!lcd_clicked()); st_synchronize(); current_position[E_AXIS] += bowden_length[mmu_extruder]; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000, active_extruder); + plan_buffer_line_curposXYZE(3000, active_extruder); current_position[E_AXIS] += FIL_LOAD_LENGTH - 60; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1400, active_extruder); + plan_buffer_line_curposXYZE(1400, active_extruder); current_position[E_AXIS] += 40; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400, active_extruder); + plan_buffer_line_curposXYZE(400, active_extruder); current_position[E_AXIS] += 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); #else current_position[E_AXIS]+= FILAMENTCHANGE_FIRSTFEED ; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FIRST, active_extruder); + plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST, active_extruder); #endif load_filament_final_feed(); lcd_loading_filament(); diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 1edac56b..6466edc4 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -919,7 +919,7 @@ static inline void go_xy(float x, float y, float fr) static inline void go_to_current(float fr) { - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], fr, active_extruder); + plan_buffer_line_curposXYZE(fr, active_extruder); st_synchronize(); } @@ -2769,7 +2769,7 @@ bool sample_z() { //make space current_position[Z_AXIS] += 150; go_to_current(homing_feedrate[Z_AXIS] / 60); - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate, active_extruder);); + //plan_buffer_line_curposXYZE(feedrate, active_extruder);); lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET)); diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 2c81a6e8..e7a59e75 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -537,7 +537,7 @@ void mmu_command(MmuCmd cmd) void mmu_load_step(bool synchronize) { current_position[E_AXIS] = current_position[E_AXIS] + MMU_LOAD_FEEDRATE * 0.1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); if (synchronize) st_synchronize(); } @@ -602,7 +602,7 @@ bool mmu_get_response(uint8_t move) { printf_P(PSTR("Unload 1\n")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); st_synchronize(); } } @@ -620,7 +620,7 @@ bool mmu_get_response(uint8_t move) { printf_P(PSTR("Unload 2\n")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); st_synchronize(); } } @@ -698,13 +698,13 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) //lift z current_position[Z_AXIS] += Z_PAUSE_LIFT; if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); + plan_buffer_line_curposXYZE(15, active_extruder); st_synchronize(); //Move XY to side current_position[X_AXIS] = X_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); st_synchronize(); } if (turn_off_nozzle) { @@ -762,10 +762,10 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) lcd_display_message_fullscreen_P(_i("MMU OK. Resuming position...")); current_position[X_AXIS] = x_position_bckp; current_position[Y_AXIS] = y_position_bckp; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); st_synchronize(); current_position[Z_AXIS] = z_position_bckp; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); + plan_buffer_line_curposXYZE(15, active_extruder); st_synchronize(); } else { @@ -804,19 +804,19 @@ void mmu_load_to_nozzle() current_position[E_AXIS] += 7.2f; } float feedrate = 562; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); st_synchronize(); current_position[E_AXIS] += 14.4f; feedrate = 871; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); st_synchronize(); current_position[E_AXIS] += 36.0f; feedrate = 1393; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); st_synchronize(); current_position[E_AXIS] += 14.4f; feedrate = 871; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate / 60, active_extruder); + plan_buffer_line_curposXYZE(feedrate / 60, active_extruder); st_synchronize(); if (!saved_e_relative_mode) axis_relative_modes[E_AXIS] = false; } @@ -903,7 +903,7 @@ void extr_mov(float shift, float feed_rate) { //move extruder no matter what the current heater temperature is set_extrude_min_temp(.0); current_position[E_AXIS] += shift; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feed_rate, active_extruder); + plan_buffer_line_curposXYZE(feed_rate, active_extruder); set_extrude_min_temp(EXTRUDE_MINTEMP); } #endif //SNMM @@ -1069,8 +1069,7 @@ void mmu_filament_ramming() for(uint8_t i = 0; i < (sizeof(ramming_sequence)/sizeof(E_step));++i) { current_position[E_AXIS] += pgm_read_float(&(ramming_sequence[i].extrude)); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], pgm_read_float(&(ramming_sequence[i].feed_rate)), active_extruder); + plan_buffer_line_curposXYZE(pgm_read_float(&(ramming_sequence[i].feed_rate)), active_extruder); st_synchronize(); } } @@ -1140,39 +1139,39 @@ void extr_unload() lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); if (current_position[Z_AXIS] < 15) { current_position[Z_AXIS] += 15; //lifting in Z direction to make space for extrusion - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 25, active_extruder); + plan_buffer_line_curposXYZE(25, active_extruder); } current_position[E_AXIS] += 10; //extrusion - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 10, active_extruder); + plan_buffer_line_curposXYZE(10, active_extruder); st_current_set(2, E_MOTOR_HIGH_CURRENT); if (current_temperature[0] < 230) { //PLA & all other filaments current_position[E_AXIS] += 5.4; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2800 / 60, active_extruder); + plan_buffer_line_curposXYZE(2800 / 60, active_extruder); current_position[E_AXIS] += 3.2; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); current_position[E_AXIS] += 3; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3400 / 60, active_extruder); + plan_buffer_line_curposXYZE(3400 / 60, active_extruder); } else { //ABS current_position[E_AXIS] += 3.1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2000 / 60, active_extruder); + plan_buffer_line_curposXYZE(2000 / 60, active_extruder); current_position[E_AXIS] += 3.1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 2500 / 60, active_extruder); + plan_buffer_line_curposXYZE(2500 / 60, active_extruder); current_position[E_AXIS] += 4; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + plan_buffer_line_curposXYZE(3000 / 60, active_extruder); /*current_position[X_AXIS] += 23; //delay - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); //delay + plan_buffer_line_curposXYZE(600 / 60, active_extruder); //delay current_position[X_AXIS] -= 23; //delay - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 600 / 60, active_extruder); //delay*/ + plan_buffer_line_curposXYZE(600 / 60, active_extruder); //delay*/ delay_keep_alive(4700); } max_feedrate[E_AXIS] = 80; current_position[E_AXIS] -= (bowden_length[mmu_extruder] + 60 + FIL_LOAD_LENGTH) / 2; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 500, active_extruder); + plan_buffer_line_curposXYZE(500, active_extruder); current_position[E_AXIS] -= (bowden_length[mmu_extruder] + 60 + FIL_LOAD_LENGTH) / 2; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 500, active_extruder); + plan_buffer_line_curposXYZE(500, active_extruder); st_synchronize(); //st_current_init(); if (SilentMode != SILENT_MODE_OFF) st_current_set(2, tmp_motor[2]); //set back to normal operation currents @@ -1465,11 +1464,9 @@ bFilamentAction=false; // NOT in "mmu_fil_eject_menu( static bool can_load() { current_position[E_AXIS] += 60; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); current_position[E_AXIS] -= 52; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); st_synchronize(); uint_least8_t filament_detected_count = 0; @@ -1479,8 +1476,7 @@ static bool can_load() for(uint_least8_t i = 0; i < steps; ++i) { current_position[E_AXIS] -= e_increment; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], - current_position[E_AXIS], MMU_LOAD_FEEDRATE, active_extruder); + plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE, active_extruder); st_synchronize(); if(0 == PIN_GET(IR_SENSOR_PIN)) { @@ -1601,13 +1597,13 @@ void mmu_continue_loading(bool blocking) //lift z current_position[Z_AXIS] += Z_PAUSE_LIFT; if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); + plan_buffer_line_curposXYZE(15, active_extruder); st_synchronize(); //Move XY to side current_position[X_AXIS] = X_PAUSE_POS; current_position[Y_AXIS] = Y_PAUSE_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); st_synchronize(); mmu_command(MmuCmd::U0); diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 4a8d6659..752d0725 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -651,11 +651,15 @@ void planner_abort_hard() waiting_inside_plan_buffer_line_print_aborted = true; } +void plan_buffer_line_curposXYZE(float feed_rate, uint8_t extruder) { + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feed_rate, extruder ); +} + float junction_deviation = 0.1; // Add a new linear movement to the buffer. steps_x, _y and _z is the absolute position in // mm. Microseconds specify how many microseconds the move should take to perform. To aid acceleration // calculation the caller must also provide the physical length of the line in millimeters. -void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder) +void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder) { // Calculate the buffer head after we push this byte int next_buffer_head = next_block_index(block_buffer_head); diff --git a/Firmware/planner.h b/Firmware/planner.h index b6a9f836..7904c45a 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -140,7 +140,14 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // Get the position applying the bed level matrix if enabled vector_3 plan_get_position(); #else -void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, const uint8_t &extruder); + +/// Extracting common call of +/// plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], ... +/// saves almost 5KB. +/// The performance penalty is negligible, since these planned lines are usually maintenance moves with the extruder. +void plan_buffer_line_curposXYZE(float feed_rate, uint8_t extruder); + +void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate, uint8_t extruder); //void plan_buffer_line(const float &x, const float &y, const float &z, const float &e, float feed_rate, const uint8_t &extruder); #endif // ENABLE_AUTO_BED_LEVELING diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 66bdc764..1e0aa9cc 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2904,7 +2904,7 @@ static void _lcd_move(const char *name, int 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(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[axis] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[axis] / 60, active_extruder); lcd_draw_update = 1; } } @@ -2929,7 +2929,7 @@ static void lcd_move_e() { current_position[E_AXIS] += float((int)lcd_encoder) * move_menu_scale; lcd_encoder = 0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[E_AXIS] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[E_AXIS] / 60, active_extruder); lcd_draw_update = 1; } } @@ -3428,7 +3428,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) // Only move up, whatever direction the user rotates the encoder. current_position[Z_AXIS] += fabs(lcd_encoder); lcd_encoder = 0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[Z_AXIS] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60, active_extruder); } } if (lcd_clicked()) { @@ -4621,7 +4621,7 @@ void lcd_calibrate_pinda() { lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_PLEASE_WAIT)); current_position[E_AXIS] += e_shift_calibration; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate, active_extruder); + plan_buffer_line_curposXYZE(feedrate, active_extruder); st_synchronize(); lcd_display_message_fullscreen_P(msg_e_cal_knob); @@ -4644,7 +4644,7 @@ void lcd_calibrate_pinda() { if (!planner_queue_full()) { current_position[E_AXIS] += float(abs((int)lcd_encoder)) * 0.01; //0.05 lcd_encoder = 0; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate, active_extruder); + plan_buffer_line_curposXYZE(feedrate, active_extruder); } } @@ -4764,7 +4764,7 @@ void lcd_language() static void wait_preheat() { current_position[Z_AXIS] = 100; //move in z axis to make space for loading filament - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[Z_AXIS] / 60, active_extruder); + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60, active_extruder); delay_keep_alive(2000); lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); lcd_set_custom_characters(); @@ -6218,13 +6218,13 @@ void unload_filament() // extr_unload2(); current_position[E_AXIS] -= 45; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 5200 / 60, active_extruder); + plan_buffer_line_curposXYZE(5200 / 60, active_extruder); st_synchronize(); current_position[E_AXIS] -= 15; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1000 / 60, active_extruder); + plan_buffer_line_curposXYZE(1000 / 60, active_extruder); st_synchronize(); current_position[E_AXIS] -= 20; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 1000 / 60, active_extruder); + plan_buffer_line_curposXYZE(1000 / 60, active_extruder); st_synchronize(); lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); @@ -7308,7 +7308,7 @@ bool lcd_selftest() //homeaxis(X_AXIS); //homeaxis(Y_AXIS); current_position[Z_AXIS] = current_position[Z_AXIS] + 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); _progress = lcd_selftest_screen(TestScreen::AxisZ, _progress, 3, true, 1500); _result = lcd_selfcheck_axis(2, Z_MAX_POS); @@ -7322,7 +7322,7 @@ bool lcd_selftest() if (_result) { current_position[Z_AXIS] = current_position[Z_AXIS] + 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); _progress = lcd_selftest_screen(TestScreen::Home, 0, 2, true, 0); bool bres = tmc2130_home_calibrate(X_AXIS); @@ -7406,7 +7406,7 @@ bool lcd_selftest() static void reset_crash_det(unsigned char axis) { current_position[axis] += 10; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); if (eeprom_read_byte((uint8_t*)EEPROM_CRASH_DET)) tmc2130_sg_stop_on_crash = true; } @@ -7430,7 +7430,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { if (axis == X_AXIS) { //there is collision between cables and PSU cover in X axis if Z coordinate is too low current_position[Z_AXIS] += 17; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); tmc2130_home_enter(Z_AXIS_MASK); st_synchronize(); tmc2130_home_exit(); @@ -7439,7 +7439,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { // first axis length measurement begin current_position[axis] -= (axis_length + margin); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); @@ -7449,11 +7449,11 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { current_position_init = st_get_position_mm(axis); current_position[axis] += 2 * margin; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); current_position[axis] += axis_length; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); @@ -7469,11 +7469,11 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { current_position[axis] -= margin; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); current_position[axis] -= (axis_length + margin); - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); @@ -7542,13 +7542,13 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) if (_axis == X_AXIS) { current_position[Z_AXIS] += 17; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); } do { current_position[_axis] = current_position[_axis] - 1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); #ifdef TMC2130 if ((READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING)) @@ -7602,7 +7602,7 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) //current_position[_axis] = current_position[_axis] + 15; - //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + //plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); if (!_stepresult) { @@ -7650,17 +7650,17 @@ static bool lcd_selfcheck_pulleys(int axis) current_position_init = current_position[axis]; current_position[axis] += 2; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); for (i = 0; i < 5; i++) { refresh_cmd_timeout(); current_position[axis] = current_position[axis] + move; st_current_set(0, 850); //set motor current higher - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], 200, active_extruder); + plan_buffer_line_curposXYZE(200, active_extruder); st_synchronize(); if (SilentModeMenu != SILENT_MODE_OFF) st_current_set(0, tmp_motor[0]); //set back to normal operation currents else st_current_set(0, tmp_motor_loud[0]); //set motor current back current_position[axis] = current_position[axis] - move; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], 50, active_extruder); + plan_buffer_line_curposXYZE(50, active_extruder); st_synchronize(); if (((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) || ((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1)) { @@ -7677,7 +7677,7 @@ static bool lcd_selfcheck_pulleys(int axis) endstop_triggered = true; if (current_position_init - 1 <= current_position[axis] && current_position_init + 1 >= current_position[axis]) { current_position[axis] += (axis == X_AXIS) ? 13 : 9; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); return(true); } @@ -7688,7 +7688,7 @@ static bool lcd_selfcheck_pulleys(int axis) } else { current_position[axis] -= 1; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); st_synchronize(); if (_millis() > timeout_counter) { lcd_selftest_error(TestError::Pulley, (axis == 0) ? "X" : "Y", ""); @@ -7712,7 +7712,7 @@ static bool lcd_selfcheck_endstops() if ((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1) current_position[1] += 10; if ((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING) == 1) current_position[2] += 10; } - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], manual_feedrate[0] / 60, active_extruder); + plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); _delay(500); if (((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) || From 3eb36ca194edd7e4a020869663cb534c6ba53ec1 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 23 Aug 2019 16:48:30 +0200 Subject: [PATCH 038/104] Fix cmdqueue_dump_to_serial. Header was historically made bigger to contain size of the command on SD card, but those debug functions wasn't updated. --- Firmware/cmdqueue.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 37b6388d..74a8b90a 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -224,9 +224,13 @@ void cmdqueue_dump_to_serial_single_line(int nr, const char *p) SERIAL_ECHOPGM("Entry nr: "); SERIAL_ECHO(nr); SERIAL_ECHOPGM(", type: "); - SERIAL_ECHO(int(*p)); + int type = *p; + SERIAL_ECHO(type); + SERIAL_ECHOPGM(", size: "); + unsigned int size = *(unsigned int*)(p + 1); + SERIAL_ECHO(size); SERIAL_ECHOPGM(", cmd: "); - SERIAL_ECHO(p+1); + SERIAL_ECHO(p + CMDHDRSIZE); SERIAL_ECHOLNPGM(""); } @@ -247,7 +251,7 @@ void cmdqueue_dump_to_serial() for (const char *p = cmdbuffer + bufindr; p < cmdbuffer + bufindw; ++ nr) { cmdqueue_dump_to_serial_single_line(nr, p); // Skip the command. - for (++p; *p != 0; ++ p); + for (p += CMDHDRSIZE; *p != 0; ++ p); // Skip the gaps. for (++p; p < cmdbuffer + bufindw && *p == 0; ++ p); } @@ -255,14 +259,14 @@ void cmdqueue_dump_to_serial() for (const char *p = cmdbuffer + bufindr; p < cmdbuffer + sizeof(cmdbuffer); ++ nr) { cmdqueue_dump_to_serial_single_line(nr, p); // Skip the command. - for (++p; *p != 0; ++ p); + for (p += CMDHDRSIZE; *p != 0; ++ p); // Skip the gaps. for (++p; p < cmdbuffer + sizeof(cmdbuffer) && *p == 0; ++ p); } for (const char *p = cmdbuffer; p < cmdbuffer + bufindw; ++ nr) { cmdqueue_dump_to_serial_single_line(nr, p); // Skip the command. - for (++p; *p != 0; ++ p); + for (p += CMDHDRSIZE; *p != 0; ++ p); // Skip the gaps. for (++p; p < cmdbuffer + bufindw && *p == 0; ++ p); } From 52cb37770b7c36982b7c05f8297fe774a7be70e6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 23 Aug 2019 19:27:58 +0200 Subject: [PATCH 039/104] Fix repeated power panic restarted print from beginning or jumped at most 65536 B back in file printed from SD card. As sdpos_atomic was not updated after printer power up and first power panic recovery, it was equal 0. When the first command from SD card was queued its size on SD card was computed as current SD index position minus sdpos_atomic. This was equal to offset from beginning of the file limited to 16 bit storage type. When next power outage occurred earlier then this command was finished and wiped out of queue, this command size (extraordinarily big) was subtracted from sdpos_atomic and saved to EEPROM. This led to up to 65536 B jump back in file printed after next power panic recovery. --- Firmware/Marlin_main.cpp | 6 ++++-- Firmware/cmdqueue.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 10c5437e..79cdba1a 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5343,7 +5343,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // ---------------------------------- case 26: if(card.cardOK && code_seen('S')) { - card.setIndex(code_value_long()); + long index = code_value_long(); + card.setIndex(index); + sdpos_atomic = index; } break; @@ -9497,7 +9499,7 @@ void serialecho_temperatures() { SERIAL_PROTOCOL_F(degBed(), 1); SERIAL_PROTOCOLLN(""); } -extern uint32_t sdpos_atomic; + #ifdef UVLO_SUPPORT void uvlo_() diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 6c81db29..13185f17 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -45,6 +45,8 @@ extern bool cmdbuffer_front_already_processed; // Debugging information will be sent to serial line. //#define CMDBUFFER_DEBUG +extern uint32_t sdpos_atomic; + extern int serial_count; extern boolean comment_mode; extern char *strchr_pointer; From c27fcf9cffafb9837bcfc0b39bc189e4b8c72849 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 17:03:18 +0200 Subject: [PATCH 040/104] Increase version to 3.8.0-RC2 and build number to 2639. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 870eee89..ebda4960 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -16,8 +16,8 @@ extern uint16_t nPrinterType; extern PGM_P sPrinterName; // Firmware version -#define FW_VERSION "3.8.0" -#define FW_COMMIT_NR 2608 +#define FW_VERSION "3.8.0-RC2" +#define FW_COMMIT_NR 2639 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN From 159a1a70d8d168d98269fd5c21bef14d0275b577 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 17:19:57 +0200 Subject: [PATCH 041/104] Update documentation. --- Firmware/Marlin_main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 79cdba1a..5279776d 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5339,12 +5339,17 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) card.pauseSDPrint(); break; - //! ### M26 - Set SD index + //! ### M26 S\ - Set SD index + //! Set position in SD card file to index in bytes. + //! This command is expected to be called after M23 and before M24. + //! Otherwise effect of this command is undefined. // ---------------------------------- case 26: if(card.cardOK && code_seen('S')) { long index = code_value_long(); card.setIndex(index); + // We don't disable interrupt during update of sdpos_atomic + // as we expect, that SD card print is not active in this moment sdpos_atomic = index; } break; From b9b0d6049e13d37d4dcffc11576d3ab063b7edc0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 19:48:39 +0200 Subject: [PATCH 042/104] Fix formatting. --- Firmware/ultralcd.cpp | 217 +++++++++++++++++++++--------------------- 1 file changed, 109 insertions(+), 108 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd75..58995ddc 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2360,118 +2360,119 @@ else { } */ -void mFilamentItem(uint16_t nTemp,uint16_t nTempBed) +void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { -static int nTargetOld,nTargetBedOld; -uint8_t nLevel; + static int nTargetOld; + static int nTargetBedOld; + uint8_t nLevel; -//if(bPreheatState) // not necessary - nTargetOld=target_temperature[0]; - nTargetBedOld=target_temperature_bed; -setTargetHotend0((float)nTemp); -setTargetBed((float)nTempBed); -lcd_timeoutToStatus.stop(); -if(current_temperature[0]>(target_temperature[0]*0.95)) - { - switch(eFilamentAction) - { - case FilamentAction::Load: - case FilamentAction::AutoLoad: - case FilamentAction::UnLoad: - if(bFilamentWaitingFlag) - menu_submenu(mFilamentPrompt); - else { - nLevel=bFilamentPreheatState?1:2; - menu_back(nLevel); - if((eFilamentAction==FilamentAction::Load)||(eFilamentAction==FilamentAction::AutoLoad)) - { - loading_flag=true; - enquecommand_P(PSTR("M701")); // load filament - if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad - } - if(eFilamentAction==FilamentAction::UnLoad) - enquecommand_P(PSTR("M702")); // unload filament - } - break; - case FilamentAction::MmuLoad: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_load_to_nozzle_menu); - break; - case FilamentAction::MmuUnLoad: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - extr_unload(); - break; - case FilamentAction::MmuEject: - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_fil_eject_menu); - break; - case FilamentAction::MmuCut: + nTargetOld = target_temperature[0]; + nTargetBedOld = target_temperature_bed; + setTargetHotend0((float )nTemp); + setTargetBed((float) nTempBed); + + lcd_timeoutToStatus.stop(); + + if (current_temperature[0] > (target_temperature[0] * 0.95)) + { + switch (eFilamentAction) + { + case FilamentAction::Load: + case FilamentAction::AutoLoad: + case FilamentAction::UnLoad: + if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt); + else + { + nLevel = bFilamentPreheatState ? 1 : 2; + menu_back(nLevel); + if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) + { + loading_flag = true; + enquecommand_P(PSTR("M701")); // load filament + if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } + if (eFilamentAction == FilamentAction::UnLoad) + enquecommand_P(PSTR("M702")); // unload filament + } + break; + case FilamentAction::MmuLoad: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + menu_submenu(mmu_load_to_nozzle_menu); + break; + case FilamentAction::MmuUnLoad: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + extr_unload(); + break; + case FilamentAction::MmuEject: + nLevel = bFilamentPreheatState ? 1 : 2; + bFilamentAction = true; + menu_back(nLevel); + menu_submenu(mmu_fil_eject_menu); + break; + case FilamentAction::MmuCut: #ifdef MMU_HAS_CUTTER - nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_cut_filament_menu); + nLevel=bFilamentPreheatState?1:2; + bFilamentAction=true; + menu_back(nLevel); + menu_submenu(mmu_cut_filament_menu); #endif //MMU_HAS_CUTTER - break; - case FilamentAction::None: - break; - } - if(bFilamentWaitingFlag) - Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); - bFilamentWaitingFlag=false; - } -else { - bFilamentWaitingFlag=true; - lcd_set_cursor(0,0); - lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); - lcd_set_cursor(0,1); - switch(eFilamentAction) - { - case FilamentAction::Load: - case FilamentAction::AutoLoad: - case FilamentAction::MmuLoad: - lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 - break; - case FilamentAction::UnLoad: - case FilamentAction::MmuUnLoad: - lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 - break; - case FilamentAction::MmuEject: - lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 - break; - case FilamentAction::MmuCut: - lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 - break; - case FilamentAction::None: - break; - } - lcd_set_cursor(0,3); - lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 - if(lcd_clicked()) - { - bFilamentWaitingFlag=false; - if(!bFilamentPreheatState) - { - setTargetHotend0(0.0); - setTargetBed(0.0); - menu_back(); - } - else { - setTargetHotend0((float)nTargetOld); - setTargetBed((float)nTargetBedOld); - } - menu_back(); - if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad - } - } + break; + case FilamentAction::None: + break; + } + if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); + bFilamentWaitingFlag = false; + } + else + { + bFilamentWaitingFlag = true; + lcd_set_cursor(0, 0); + lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0)); + lcd_set_cursor(0, 1); + switch (eFilamentAction) + { + case FilamentAction::Load: + case FilamentAction::AutoLoad: + case FilamentAction::MmuLoad: + lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 + break; + case FilamentAction::UnLoad: + case FilamentAction::MmuUnLoad: + lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 + break; + case FilamentAction::MmuEject: + lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 + break; + case FilamentAction::MmuCut: + lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 + break; + case FilamentAction::None: + break; + } + lcd_set_cursor(0, 3); + lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 + if (lcd_clicked()) + { + bFilamentWaitingFlag = false; + if (!bFilamentPreheatState) + { + setTargetHotend0(0.0); + setTargetBed(0.0); + menu_back(); + } + else + { + setTargetHotend0((float )nTargetOld); + setTargetBed((float) nTargetBedOld); + } + menu_back(); + if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } + } } static void mFilamentItem_PLA() From 3628d893eed766eb69e8eb36cc0edb27672697ec Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 20:11:52 +0200 Subject: [PATCH 043/104] Remove duplicate preheat menu. Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing. --- Firmware/ultralcd.cpp | 30 +++++++++--------------------- Firmware/ultralcd.h | 1 + 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 58995ddc..31af3e8c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2025,27 +2025,8 @@ static void lcd_menu_test_restore() static void lcd_preheat_menu() { - MENU_BEGIN(); - - if (!wizard_active) MENU_ITEM_BACK_P(_T(MSG_MAIN)); - - if (farm_mode) { - MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); - MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), lcd_preheat_farm_nozzle); - MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); - } else { - MENU_ITEM_FUNCTION_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); - MENU_ITEM_FUNCTION_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); - MENU_ITEM_FUNCTION_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)), lcd_preheat_asa); - MENU_ITEM_FUNCTION_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); - MENU_ITEM_FUNCTION_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); - MENU_ITEM_FUNCTION_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); - MENU_ITEM_FUNCTION_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex); - if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); - } - - - MENU_END(); + eFilamentAction = FilamentAction::Preheat; + mFilamentMenu(); } static void lcd_support_menu() @@ -2371,6 +2352,13 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) setTargetHotend0((float )nTemp); setTargetBed((float) nTempBed); + if (eFilamentAction == FilamentAction::Preheat) + { + eFilamentAction = FilamentAction::None; + lcd_return_to_status(); + return; + } + lcd_timeoutToStatus.stop(); if (current_temperature[0] > (target_temperature[0] * 0.95)) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index f414a1cc..516a3135 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -167,6 +167,7 @@ enum class FilamentAction : uint_least8_t MmuUnLoad, MmuEject, MmuCut, + Preheat, }; extern FilamentAction eFilamentAction; From 52ae62bbba94e09113fa32edf00336f187a51e2a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 20:14:00 +0200 Subject: [PATCH 044/104] Fix formatting. --- Firmware/ultralcd.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 31af3e8c..1dc094d7 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2509,15 +2509,15 @@ if(eFilamentAction==FilamentAction::AutoLoad) void mFilamentMenu() { -MENU_BEGIN(); -MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); -MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); -MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); -MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); -MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); -MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); -MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); -MENU_END(); + MENU_BEGIN(); + MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); + MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); + MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); + MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); + MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); + MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); + MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + MENU_END(); } void mFilamentItemForce() From 668e89e5a96f35d8fc2d0fc9a792697571664cee Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 20:18:34 +0200 Subject: [PATCH 045/104] Preheat menu: Add ASA, hide menu item back when in wizard. --- Firmware/ultralcd.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1dc094d7..a307a174 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2475,6 +2475,12 @@ bFilamentPreheatState=false; mFilamentItem(PET_PREHEAT_HOTEND_TEMP,PET_PREHEAT_HPB_TEMP); } +static void mFilamentItem_ASA() +{ +bFilamentPreheatState=false; +mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP); +} + static void mFilamentItem_ABS() { bFilamentPreheatState=false; @@ -2510,9 +2516,10 @@ if(eFilamentAction==FilamentAction::AutoLoad) void mFilamentMenu() { MENU_BEGIN(); - MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); + if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); + MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); From aa13f9e809ed16a47d03c8ded2cf38fc1b6b03b5 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 20:19:34 +0200 Subject: [PATCH 046/104] Fix formatting. --- Firmware/ultralcd.cpp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a307a174..dc4c97d3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2465,52 +2465,50 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) static void mFilamentItem_PLA() { -bFilamentPreheatState=false; -mFilamentItem(PLA_PREHEAT_HOTEND_TEMP,PLA_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PLA_PREHEAT_HOTEND_TEMP, PLA_PREHEAT_HPB_TEMP); } static void mFilamentItem_PET() { -bFilamentPreheatState=false; -mFilamentItem(PET_PREHEAT_HOTEND_TEMP,PET_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PET_PREHEAT_HOTEND_TEMP, PET_PREHEAT_HPB_TEMP); } static void mFilamentItem_ASA() { -bFilamentPreheatState=false; -mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP); } static void mFilamentItem_ABS() { -bFilamentPreheatState=false; -mFilamentItem(ABS_PREHEAT_HOTEND_TEMP,ABS_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(ABS_PREHEAT_HOTEND_TEMP, ABS_PREHEAT_HPB_TEMP); } static void mFilamentItem_HIPS() { -bFilamentPreheatState=false; -mFilamentItem(HIPS_PREHEAT_HOTEND_TEMP,HIPS_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(HIPS_PREHEAT_HOTEND_TEMP, HIPS_PREHEAT_HPB_TEMP); } static void mFilamentItem_PP() { -bFilamentPreheatState=false; -mFilamentItem(PP_PREHEAT_HOTEND_TEMP,PP_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(PP_PREHEAT_HOTEND_TEMP, PP_PREHEAT_HPB_TEMP); } static void mFilamentItem_FLEX() { -bFilamentPreheatState=false; -mFilamentItem(FLEX_PREHEAT_HOTEND_TEMP,FLEX_PREHEAT_HPB_TEMP); + bFilamentPreheatState = false; + mFilamentItem(FLEX_PREHEAT_HOTEND_TEMP, FLEX_PREHEAT_HPB_TEMP); } - void mFilamentBack() { -menu_back(); -if(eFilamentAction==FilamentAction::AutoLoad) - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad + menu_back(); + if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } void mFilamentMenu() From 4792559536f30fed4a36c57de43418745b4d84c4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 21:00:30 +0200 Subject: [PATCH 047/104] Add farm preheat items. Add setWatch() call. --- Firmware/ultralcd.cpp | 53 +++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dc4c97d3..e8fb8524 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1665,24 +1665,6 @@ static void lcd_move_menu_axis(); /* Menu implementation */ -static void lcd_preheat_farm() -{ - setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); - setTargetBed(FARM_PREHEAT_HPB_TEMP); - fanSpeed = 0; - lcd_return_to_status(); - setWatch(); // heater sanity check timer -} - -static void lcd_preheat_farm_nozzle() -{ - setTargetHotend0(FARM_PREHEAT_HOTEND_TEMP); - setTargetBed(0); - fanSpeed = 0; - lcd_return_to_status(); - setWatch(); // heater sanity check timer -} - static void lcd_preheat_pla() { setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); @@ -2355,6 +2337,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if (eFilamentAction == FilamentAction::Preheat) { eFilamentAction = FilamentAction::None; + setWatch(); lcd_return_to_status(); return; } @@ -2463,6 +2446,17 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) } } +static void mFilamentItem_farm() +{ + bFilamentPreheatState = false; + mFilamentItem(FARM_PREHEAT_HOTEND_TEMP, FARM_PREHEAT_HPB_TEMP); +} +static void mFilamentItem_farm_nozzle() +{ + bFilamentPreheatState = false; + mFilamentItem(FARM_PREHEAT_HOTEND_TEMP, 0); +} + static void mFilamentItem_PLA() { bFilamentPreheatState = false; @@ -2515,13 +2509,22 @@ void mFilamentMenu() { MENU_BEGIN(); if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); - MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); - MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); - MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); - MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); - MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); - MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); - MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + if (farm_mode) + { + MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), mFilamentItem_farm); + MENU_ITEM_FUNCTION_P(PSTR("nozzle - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/0"), mFilamentItem_farm_nozzle); + } + else + { + MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); + MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); + MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); + MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); + MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); + MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); + MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + } + if (!wizard_active && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); MENU_END(); } From 3da43ae8c2ea43c22d33e99dc299106163b83616 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 26 Aug 2019 21:14:07 +0200 Subject: [PATCH 048/104] Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile. --- Firmware/ultralcd.cpp | 7 ------- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 8 -------- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 8 -------- 8 files changed, 63 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e8fb8524..49e54c49 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1669,7 +1669,6 @@ static void lcd_preheat_pla() { setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); - fanSpeed = PLA_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1679,7 +1678,6 @@ static void lcd_preheat_asa() { setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); - fanSpeed = ASA_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1689,7 +1687,6 @@ static void lcd_preheat_abs() { setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); - fanSpeed = ABS_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1699,7 +1696,6 @@ static void lcd_preheat_pp() { setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); - fanSpeed = PP_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1709,7 +1705,6 @@ static void lcd_preheat_pet() { setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); - fanSpeed = PET_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1719,7 +1714,6 @@ static void lcd_preheat_hips() { setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); - fanSpeed = HIPS_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); @@ -1729,7 +1723,6 @@ static void lcd_preheat_flex() { setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); - fanSpeed = FLEX_PREHEAT_FAN_SPEED; lcd_return_to_status(); setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index fbbc332d..997ab3d4 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -319,35 +319,27 @@ PREHEAT SETTINGS #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 55 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 240 #define PET_PREHEAT_HPB_TEMP 90 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 230 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index d0d0341c..80616763 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -377,35 +377,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index c931b7db..ad95d117 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -378,35 +378,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index c5df948c..b43a1674 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -377,35 +377,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index cc2498d6..5765c1c7 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -378,35 +378,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b2b26617..d55d6386 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -487,35 +487,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 5736b632..ce7318ca 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -489,35 +489,27 @@ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 80 -#define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 -#define ASA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 #define PET_PREHEAT_HOTEND_TEMP 230 #define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ THERMISTORS SETTINGS From 11ce786aaa5856f4be6024911b537a5f44ee681e Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 27 Aug 2019 13:47:58 +0200 Subject: [PATCH 049/104] Support for more special characters allowed in file names (^ + = [ ] ; ,) --- Firmware/Marlin_main.cpp | 14 +++++++++----- Firmware/SdBaseFile.cpp | 5 ++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5279776d..a034f94e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3815,10 +3815,14 @@ eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF); // lcd_calibration(); // } - } - else if (code_seen('^')) { - // nothing, this is a version line - } else if(code_seen('G')) + } + // This prevents reading files with "^" in their names. + // Since it is unclear, if there is some usage of this construct, + // it will be deprecated in 3.9 alpha a possibly completely removed in the future: + // else if (code_seen('^')) { + // // nothing, this is a version line + // } + else if(code_seen('G')) { gcode_in_progress = (int)code_value(); // printf_P(_N("BEGIN G-CODE=%u\n"), gcode_in_progress); @@ -5319,7 +5323,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // ----------------------------------- case 23: starpos = (strchr(strchr_pointer + 4,'*')); - if(starpos!=NULL) + if(starpos!=NULL) *(starpos)='\0'; card.openFile(strchr_pointer + 4,true); break; diff --git a/Firmware/SdBaseFile.cpp b/Firmware/SdBaseFile.cpp index be04ab1a..b9e881ef 100644 --- a/Firmware/SdBaseFile.cpp +++ b/Firmware/SdBaseFile.cpp @@ -394,7 +394,10 @@ bool SdBaseFile::make83Name(const char* str, uint8_t* name, const char** ptr) { i = 8; // place for extension } else { // illegal FAT characters - PGM_P p = PSTR("|<>^+=?/[];,*\"\\"); + //PGM_P p = PSTR("|<>^+=?/[];,*\"\\"); + // 2019-08-27 really? + // Microsoft defines, that only a subset of these characters is not allowed. + PGM_P p = PSTR("|<>?/*\"\\"); uint8_t b; while ((b = pgm_read_byte(p++))) if (b == c) goto fail; // check size and only allow ASCII printable characters From bf2097342dfe4ef8902a67805f92e644e4cb4e75 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 17:01:41 +0200 Subject: [PATCH 050/104] Add ASA preheat into mFilamentMenu(); --- Firmware/ultralcd.cpp | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd75..43ab4042 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2486,6 +2486,12 @@ bFilamentPreheatState=false; mFilamentItem(PET_PREHEAT_HOTEND_TEMP,PET_PREHEAT_HPB_TEMP); } +static void mFilamentItem_ASA() +{ + bFilamentPreheatState=false; + mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP); +} + static void mFilamentItem_ABS() { bFilamentPreheatState=false; @@ -2520,15 +2526,16 @@ if(eFilamentAction==FilamentAction::AutoLoad) void mFilamentMenu() { -MENU_BEGIN(); -MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); -MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); -MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); -MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); -MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); -MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); -MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); -MENU_END(); + MENU_BEGIN(); + MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); + MENU_ITEM_SUBMENU_P(PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)),mFilamentItem_PLA); + MENU_ITEM_SUBMENU_P(PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)),mFilamentItem_PET); + MENU_ITEM_SUBMENU_P(PSTR("ASA - " STRINGIFY(ASA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ASA_PREHEAT_HPB_TEMP)),mFilamentItem_ASA); + MENU_ITEM_SUBMENU_P(PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)),mFilamentItem_ABS); + MENU_ITEM_SUBMENU_P(PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)),mFilamentItem_HIPS); + MENU_ITEM_SUBMENU_P(PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)),mFilamentItem_PP); + MENU_ITEM_SUBMENU_P(PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)),mFilamentItem_FLEX); + MENU_END(); } void mFilamentItemForce() From 1a1be5c518cc98426d85c78da9bff6b4cee15f26 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 27 Aug 2019 17:10:29 +0200 Subject: [PATCH 051/104] Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to select filament --- Firmware/sound.h | 6 +++--- Firmware/ultralcd.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/sound.h b/Firmware/sound.h index bdd32ec8..90f3e723 100644 --- a/Firmware/sound.h +++ b/Firmware/sound.h @@ -3,10 +3,10 @@ #define SOUND_H -#define MSG_SOUND_MODE_LOUD "Sound [loud]" -#define MSG_SOUND_MODE_ONCE "Sound [once]" +#define MSG_SOUND_MODE_LOUD "Sound [loud]" +#define MSG_SOUND_MODE_ONCE "Sound [once]" #define MSG_SOUND_MODE_SILENT "Sound [silent]" -#define MSG_SOUND_MODE_BLIND "Sound [blind]" +#define MSG_SOUND_MODE_BLIND "Sound [assist]" #define e_SOUND_MODE_NULL 0xFF diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd75..12010ff3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5902,6 +5902,7 @@ 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) @@ -5952,7 +5953,6 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite lcd_print(" "); lcd_set_cursor(0, cursor_pos); lcd_print(">"); - Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); if (lcd_clicked()) From 269aef1696da5346f35e202f665dc1630b5721c5 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:05:10 +0200 Subject: [PATCH 052/104] Remove unused code guarded by WATCH_TEMP_PERIOD macro as most of the functionality is duplicate to what is implemented in temp_runaway_check(). This will release us from porting setWatch() to unified preheat menu and maintaining it. --- Firmware/Configuration.h | 5 --- Firmware/Configuration_adv.h | 12 ------- Firmware/Marlin_main.cpp | 2 -- Firmware/temperature.cpp | 68 ++---------------------------------- Firmware/temperature.h | 4 --- Firmware/ultralcd.cpp | 8 ----- 6 files changed, 2 insertions(+), 97 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 870eee89..e456b241 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -113,11 +113,6 @@ extern PGM_P sPrinterName; // #define PS_DEFAULT_OFF - -// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted. -//#define TEMP_SENSOR_1_AS_REDUNDANT -#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 - // Actual temperature must be close to target for this long before M109 returns success #define TEMP_RESIDENCY_TIME 3 // (seconds) #define TEMP_HYSTERESIS 5 // (degC) range of +/- temperatures considered "close" to the target one diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 95130287..dd77c91c 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -10,14 +10,6 @@ #endif #define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control -//// Heating sanity check: -// This waits for the watch period in milliseconds whenever an M104 or M109 increases the target temperatureLCD_PROGRESS_BAR -// If the temperature has not increased at the end of that period, the target temperature is set to zero. -// It can be reset with another M104/M109. This check is also only triggered if the target temperature and the current temperature -// differ by at least 2x WATCH_TEMP_INCREASE -//#define WATCH_TEMP_PERIOD 40000 //40 seconds -//#define WATCH_TEMP_INCREASE 10 //Heat up at least 10 degree in 20 seconds - #ifdef PIDTEMP // this adds an experimental additional term to the heating power, proportional to the extrusion speed. // if Kc is chosen well, the additional required power due to increased melting should be compensated. @@ -400,10 +392,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st //============================= Define Defines ============================ //=========================================================================== -#if EXTRUDERS > 1 && defined TEMP_SENSOR_1_AS_REDUNDANT - #error "You cannot use TEMP_SENSOR_1_AS_REDUNDANT if EXTRUDERS > 1" -#endif - #if EXTRUDERS > 1 && defined HEATERS_PARALLEL #error "You cannot use HEATERS_PARALLEL if EXTRUDERS > 1" #endif diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 10c5437e..1aa435cf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5880,7 +5880,6 @@ Sigma_Exit: { setTargetHotendSafe(code_value(), extruder); } - setWatch(); break; } @@ -6025,7 +6024,6 @@ Sigma_Exit: } #endif - setWatch(); codenum = _millis(); /* See if we are heating up or cooling down */ diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 391607e8..3c7f5fbc 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -73,10 +73,6 @@ int current_voltage_raw_bed = 0; int current_temperature_bed_raw = 0; float current_temperature_bed = 0.0; -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - int redundant_temperature_raw = 0; - float redundant_temperature = 0.0; -#endif #ifdef PIDTEMP @@ -175,13 +171,8 @@ static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; static int bed_maxttemp_raw = HEATER_BED_RAW_HI_TEMP; #endif -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - static void *heater_ttbl_map[2] = {(void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE }; - static uint8_t heater_ttbllen_map[2] = { HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN }; -#else - 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 ); -#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 float analog2temp(int raw, uint8_t e); static float analog2tempBed(int raw); @@ -195,11 +186,6 @@ enum TempRunawayStates TempRunaway_ACTIVE = 2, }; -#ifdef WATCH_TEMP_PERIOD -int watch_start_temp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0); -unsigned long watchmillis[EXTRUDERS] = ARRAY_BY_EXTRUDERS(0,0,0); -#endif //WATCH_TEMP_PERIOD - #ifndef SOFT_PWM_SCALE #define SOFT_PWM_SCALE 0 #endif @@ -728,34 +714,6 @@ void manage_heater() { soft_pwm[e] = 0; } - - #ifdef WATCH_TEMP_PERIOD - if(watchmillis[e] && _millis() - watchmillis[e] > WATCH_TEMP_PERIOD) - { - if(degHotend(e) < watch_start_temp[e] + WATCH_TEMP_INCREASE) - { - setTargetHotend(0, e); - LCD_MESSAGEPGM("Heating failed"); - SERIAL_ECHO_START; - SERIAL_ECHOLN("Heating failed"); - }else{ - watchmillis[e] = 0; - } - } - #endif - #ifdef TEMP_SENSOR_1_AS_REDUNDANT - if(fabs(current_temperature[0] - redundant_temperature) > MAX_REDUNDANT_TEMP_SENSOR_DIFF) { - disable_heater(); - if(IsStopped() == false) { - SERIAL_ERROR_START; - SERIAL_ERRORLNPGM("Extruder switched off. Temperature difference between temp sensors is too high !"); - LCD_ALERTMESSAGEPGM("Err: REDUNDANT TEMP ERROR"); - } - #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE - Stop(); - #endif - } - #endif } // End extruder for loop #define FAN_CHECK_PERIOD 5000 //5s @@ -907,11 +865,7 @@ void manage_heater() // Derived from RepRap FiveD extruder::getTemperature() // For hot end temperature measurement. static float analog2temp(int raw, uint8_t e) { -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - if(e > EXTRUDERS) -#else if(e >= EXTRUDERS) -#endif { SERIAL_ERROR_START; SERIAL_ERROR((int)e); @@ -1054,10 +1008,6 @@ static void updateTemperaturesFromRawValues() current_temperature_bed = analog2tempBed(current_temperature_bed_raw); #endif //DEBUG_HEATER_BED_SIM - #ifdef TEMP_SENSOR_1_AS_REDUNDANT - redundant_temperature = analog2temp(redundant_temperature_raw, 1); - #endif - CRITICAL_SECTION_START; temp_meas_ready = false; CRITICAL_SECTION_END; @@ -1221,20 +1171,6 @@ void tp_init() #endif //BED_MAXTEMP } -void setWatch() -{ -#ifdef WATCH_TEMP_PERIOD - for (int e = 0; e < EXTRUDERS; e++) - { - if(degHotend(e) < degTargetHotend(e) - (WATCH_TEMP_INCREASE * 2)) - { - watch_start_temp[e] = degHotend(e); - watchmillis[e] = _millis(); - } - } -#endif -} - #if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0) void temp_runaway_check(int _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed) { diff --git a/Firmware/temperature.h b/Firmware/temperature.h index e9ba11b4..7f4daa2e 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -74,9 +74,6 @@ extern int current_voltage_raw_pwr; extern int current_voltage_raw_bed; #endif -#ifdef TEMP_SENSOR_1_AS_REDUNDANT - extern float redundant_temperature; -#endif #if defined(CONTROLLERFAN_PIN) && CONTROLLERFAN_PIN > -1 extern unsigned char soft_pwm_bed; @@ -220,7 +217,6 @@ FORCE_INLINE bool isCoolingBed() { int getHeaterPower(int heater); void disable_heater(); -void setWatch(); void updatePID(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 49e54c49..8127730f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1670,7 +1670,6 @@ static void lcd_preheat_pla() setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1679,7 +1678,6 @@ static void lcd_preheat_asa() setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1688,7 +1686,6 @@ static void lcd_preheat_abs() setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1697,7 +1694,6 @@ static void lcd_preheat_pp() setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1706,7 +1702,6 @@ static void lcd_preheat_pet() setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1715,7 +1710,6 @@ static void lcd_preheat_hips() setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -1724,7 +1718,6 @@ static void lcd_preheat_flex() setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); lcd_return_to_status(); - setWatch(); // heater sanity check timer if (wizard_active) lcd_wizard(WizState::Unload); } @@ -2330,7 +2323,6 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if (eFilamentAction == FilamentAction::Preheat) { eFilamentAction = FilamentAction::None; - setWatch(); lcd_return_to_status(); return; } From ffc5a64154789c5839132867e280b8096990a6e9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:06:48 +0200 Subject: [PATCH 053/104] Remove commented out code. --- Firmware/ultralcd.cpp | 104 ------------------------------------------ 1 file changed, 104 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8127730f..f0ce1de1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2205,110 +2205,6 @@ if(lcd_clicked()) } } -/* -void _mFilamentItem(uint16_t nTemp,uint16_t nTempBed) -{ -static int nTargetOld,nTargetBedOld; -uint8_t nLevel; -static bool bBeep=false; - -//if(bPreheatState) // not necessary - nTargetOld=target_temperature[0]; - nTargetBedOld=target_temperature_bed; -setTargetHotend0((float)nTemp); -setTargetBed((float)nTempBed); -lcd_timeoutToStatus.stop(); -lcd_set_cursor(0,0); -lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); -lcd_set_cursor(0,1); -switch(eFilamentAction) - { - case eFILAMENT_ACTION::load: - case eFILAMENT_ACTION::autoLoad: - case eFILAMENT_ACTION::mmuLoad: - lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::unLoad: - case eFILAMENT_ACTION::mmuUnLoad: - lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::mmuEject: - lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1 - break; - case eFILAMENT_ACTION::mmuCut: - lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 - break; - } -lcd_set_cursor(0,3); -lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 -if(lcd_clicked()) - { - if(!bFilamentPreheatState) - { - setTargetHotend0(0.0); - setTargetBed(0.0); - menu_back(); - } - else { - setTargetHotend0((float)nTargetOld); - setTargetBed((float)nTargetBedOld); - } - menu_back(); - if(eFilamentAction==eFILAMENT_ACTION::autoLoad) - eFilamentAction=eFILAMENT_ACTION::none; // i.e. non-autoLoad - } -else { - if(current_temperature[0]>(target_temperature[0]*0.95)) - { - switch(eFilamentAction) - { - case eFILAMENT_ACTION::load: - case eFILAMENT_ACTION::autoLoad: - case eFILAMENT_ACTION::unLoad: - menu_submenu(mFilamentPrompt); - break; - case eFILAMENT_ACTION::mmuLoad: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_load_to_nozzle_menu); - break; - case eFILAMENT_ACTION::mmuUnLoad: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - extr_unload(); - break; - case eFILAMENT_ACTION::mmuEject: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_fil_eject_menu); - break; - case eFILAMENT_ACTION::mmuCut: - nLevel=1; - if(!bFilamentPreheatState) - nLevel++; - bFilamentAction=true; - menu_back(nLevel); - menu_submenu(mmu_cut_filament_menu); - break; - } - if(bBeep) - Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); - bBeep=false; - } - else bBeep=true; - } -} -*/ - void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { static int nTargetOld; From cef7f31b9f12c57cbd20d5a76af46a48d1323a62 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:13:55 +0200 Subject: [PATCH 054/104] Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action. --- Firmware/ultralcd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f0ce1de1..8d89024b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1727,6 +1727,7 @@ static void lcd_cooldown() setAllTargetHotends(0); setTargetBed(0); fanSpeed = 0; + eFilamentAction = FilamentAction::None; lcd_return_to_status(); } @@ -2383,7 +2384,11 @@ static void mFilamentItem_FLEX() void mFilamentBack() { menu_back(); - if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + if (eFilamentAction == FilamentAction::AutoLoad || + eFilamentAction == FilamentAction::Preheat) + { + eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + } } void mFilamentMenu() From d927d5b05df7a4c80d28fd444824264231fed063 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:19:03 +0200 Subject: [PATCH 055/104] Port wizard_active to mFilamentItem(). --- Firmware/ultralcd.cpp | 60 ++----------------------------------------- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8d89024b..b195315e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1665,63 +1665,6 @@ static void lcd_move_menu_axis(); /* Menu implementation */ -static void lcd_preheat_pla() -{ - setTargetHotend0(PLA_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PLA_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_asa() -{ - setTargetHotend0(ASA_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(ASA_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_abs() -{ - setTargetHotend0(ABS_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(ABS_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_pp() -{ - setTargetHotend0(PP_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PP_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_pet() -{ - setTargetHotend0(PET_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(PET_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_hips() -{ - setTargetHotend0(HIPS_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(HIPS_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - -static void lcd_preheat_flex() -{ - setTargetHotend0(FLEX_PREHEAT_HOTEND_TEMP); - if (!wizard_active) setTargetBed(FLEX_PREHEAT_HPB_TEMP); - lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); -} - - static void lcd_cooldown() { setAllTargetHotends(0); @@ -2215,12 +2158,13 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nTargetOld = target_temperature[0]; nTargetBedOld = target_temperature_bed; setTargetHotend0((float )nTemp); - setTargetBed((float) nTempBed); + if (!wizard_active) setTargetBed((float) nTempBed); if (eFilamentAction == FilamentAction::Preheat) { eFilamentAction = FilamentAction::None; lcd_return_to_status(); + if (wizard_active) lcd_wizard(WizState::Unload); return; } From e57fcc04a75b9ab1f4449f611215ac38cc93d291 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:23:48 +0200 Subject: [PATCH 056/104] Fix compiler warnings. --- Firmware/ultralcd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b195315e..e79db0ba 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2116,6 +2116,7 @@ switch(eFilamentAction) case FilamentAction::MmuEject: case FilamentAction::MmuCut: case FilamentAction::None: + case FilamentAction::Preheat: break; } if(lcd_clicked()) @@ -2144,6 +2145,7 @@ if(lcd_clicked()) case FilamentAction::MmuEject: case FilamentAction::MmuCut: case FilamentAction::None: + case FilamentAction::Preheat: break; } } @@ -2219,6 +2221,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) #endif //MMU_HAS_CUTTER break; case FilamentAction::None: + case FilamentAction::Preheat: break; } if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); @@ -2248,6 +2251,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1 break; case FilamentAction::None: + case FilamentAction::Preheat: break; } lcd_set_cursor(0, 3); From 07169ad84a2049f103f8ff6e825f7e0218f57c90 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 20:48:53 +0200 Subject: [PATCH 057/104] Make file local variable static. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e79db0ba..87092b2c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2091,7 +2091,7 @@ FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as ' bool bFilamentFirstRun; bool bFilamentPreheatState; bool bFilamentAction=false; -bool bFilamentWaitingFlag=false; +static bool bFilamentWaitingFlag=false; static void mFilamentPrompt() { From 29c8cb29275fad8f0ac7a22283ea2ff5b2b01410 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 27 Aug 2019 22:22:36 +0200 Subject: [PATCH 058/104] Fix bad merge. --- Firmware/ultralcd.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dc721a1b..87092b2c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2305,12 +2305,6 @@ static void mFilamentItem_ASA() mFilamentItem(ASA_PREHEAT_HOTEND_TEMP, ASA_PREHEAT_HPB_TEMP); } -static void mFilamentItem_ASA() -{ - bFilamentPreheatState=false; - mFilamentItem(ASA_PREHEAT_HOTEND_TEMP,ASA_PREHEAT_HPB_TEMP); -} - static void mFilamentItem_ABS() { bFilamentPreheatState = false; From 1d23cc52e9ff7edc17b091d3af9e827d0da33200 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 28 Aug 2019 09:39:28 +0200 Subject: [PATCH 059/104] endstop sound alert fixes --- Firmware/ultralcd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 12010ff3..0df9d9a0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5907,23 +5907,25 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (cursor_pos > 3) { - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); cursor_pos = 3; if (first < items_no - 3) { first++; lcd_clear(); + } else { // here we are at the very end of the list + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } } if (cursor_pos < 1) { - Sound_MakeSound(e_SOUND_TYPE_BlindAlert); cursor_pos = 1; if (first > 0) { first--; lcd_clear(); + } else { // here we are at the very end of the list + Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } } From 49bc11037cf2af7738429e853f8707b0b96e6c2a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 28 Aug 2019 18:14:10 +0200 Subject: [PATCH 060/104] Remove statements with no effect. --- Firmware/ultralcd.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 43ab4042..bb2540db 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6596,22 +6596,11 @@ static void lcd_rename_sheet_menu() static void lcd_reset_sheet() { - struct MenuData - { - bool initialized; - uint8_t selected; - char name[sizeof(Sheet::name)]; - }; - static_assert(sizeof(menu_data)>= sizeof(MenuData),"MenuData doesn't fit into menu_data"); - MenuData* menuData = (MenuData*)&(menu_data[0]); - eeprom_read_block(menuData->name, EEPROM_Sheets_base->s[selected_sheet].name, sizeof(Sheet::name)); + char name[sizeof(Sheet::name)]; - menuData->initialized = false; - strcpy_P(menuData->name, (char *)pgm_read_word(&(defaultSheetNames[selected_sheet]))); - - + strcpy_P(name, (char *)pgm_read_word(&(defaultSheetNames[selected_sheet]))); eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),0xffff); - eeprom_update_block(menuData->name,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); + eeprom_update_block(name,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); menu_back(2); } From 33675c6d1e9c692252525a33bdc8dd36766be2f4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 28 Aug 2019 18:16:35 +0200 Subject: [PATCH 061/104] Change default sheet names. --- Firmware/Marlin.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 582cea34..0da565f1 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -308,10 +308,10 @@ extern bool axis_known_position[3]; extern int fanSpeed; extern int8_t lcd_change_fil_state; -const char smooth1[] PROGMEM = "Smooth1"; -const char smooth2[] PROGMEM = "Smooth2"; -const char textured[] PROGMEM = "Textur1"; -const char *const defaultSheetNames[] PROGMEM = {smooth1,smooth2,textured}; +const char sheet1[] PROGMEM = "1"; +const char sheet2[] PROGMEM = "2"; +const char sheet3[] PROGMEM = "3"; +const char *const defaultSheetNames[] PROGMEM = {sheet1,sheet2,sheet3}; #ifdef TMC2130 void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0); From 3903dc819adafa256074da41242145ebdb0f5dc6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 28 Aug 2019 18:59:48 +0200 Subject: [PATCH 062/104] Extract function next_initialized_sheet from change_sheet_from_menu(). Make it more general to depend on sizeof(Sheets::s) instead of hard coded value of 2. --- Firmware/ultralcd.cpp | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bb2540db..9fba0039 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6515,22 +6515,31 @@ static void change_sheet() menu_back(3); } -static void change_sheet_from_menu(){ - uint8_t next_sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))+1; - while(true){ - if(next_sheet > 2) next_sheet = 0; - if(is_sheet_initialized(next_sheet)){ - eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), next_sheet); - selected_sheet = next_sheet; - break; - } - else if (next_sheet == selected_sheet){ - break; - } - else{ - next_sheet++; - } - } +//! @brief Get next initialized sheet +//! +//! If current sheet is the only sheet initialized, current sheet is returned. +//! +//! @param sheet Current sheet +//! @return next initialized sheet +//! @retval -1 no sheet is initialized +static int8_t next_initialized_sheet(int8_t sheet) +{ + for (int8_t i = 0; i < static_cast(sizeof(Sheets::s)/sizeof(Sheet)); ++i) + { + ++sheet; + if (sheet >= static_cast(sizeof(Sheets::s)/sizeof(Sheet))) sheet = 0; + if (is_sheet_initialized(sheet)) return sheet; + } + return -1; +} + +static void change_sheet_from_menu() +{ + int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); + + sheet = next_initialized_sheet(sheet); + if (sheet >= 0) eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), sheet); + menu_back(); } From 9692f94683d97750d92b05de33ed7e2fa0273ea8 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 28 Aug 2019 19:01:48 +0200 Subject: [PATCH 063/104] Move sheet menu up to be after Print from SD. --- Firmware/ultralcd.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 9fba0039..ac3c53c0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6719,6 +6719,14 @@ static void lcd_main_menu() } #endif + if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) + { + if (!farm_mode) + { + MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); + } + } + if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) { @@ -6763,14 +6771,6 @@ static void lcd_main_menu() if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu); } - - if(!isPrintPaused && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) - { - if (!farm_mode) - { - MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); - } - } if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) { From f64252b59b95205abc1242d9b94fe0f9c9f2b060 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 28 Aug 2019 19:08:53 +0200 Subject: [PATCH 064/104] Hide sheet switcher from main menu, if there are less than 2 sheets calibrated. --- Firmware/ultralcd.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ac3c53c0..4c431444 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6723,7 +6723,12 @@ static void lcd_main_menu() { if (!farm_mode) { - MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))], change_sheet_from_menu); + const int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); + const int8_t nextSheet = next_initialized_sheet(sheet); + if ((nextSheet >= 0) && (sheet != nextSheet)) // show menu only if we have 2 or more sheets initialized + { + MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[sheet], change_sheet_from_menu); + } } } From f3bb72be64631d6f7cc0c6f155c08226e8c04c99 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 03:33:33 +0200 Subject: [PATCH 065/104] Reset calibration status if there is no calibrated sheet after reset. --- Firmware/ultralcd.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4c431444..3296ce55 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6610,6 +6610,15 @@ static void lcd_reset_sheet() strcpy_P(name, (char *)pgm_read_word(&(defaultSheetNames[selected_sheet]))); eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),0xffff); eeprom_update_block(name,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); + if (selected_sheet == eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) + { + change_sheet_from_menu(); + if((-1 == next_initialized_sheet(0)) && (CALIBRATION_STATUS_CALIBRATED == calibration_status())) + { + calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); + } + } + menu_back(2); } From 32f435d1a0e2bdf7b8172a0813991aca8a7352ec Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 17:21:08 +0200 Subject: [PATCH 066/104] Increase number of configurable steel sheets to 8. Move sheets into sub menu of HW setup. --- Firmware/Marlin.h | 5 --- Firmware/eeprom.cpp | 21 +++++++---- Firmware/eeprom.h | 19 +++++----- Firmware/ultralcd.cpp | 82 ++++++++++++++++--------------------------- 4 files changed, 57 insertions(+), 70 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 0da565f1..625e079e 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -308,11 +308,6 @@ extern bool axis_known_position[3]; extern int fanSpeed; extern int8_t lcd_change_fil_state; -const char sheet1[] PROGMEM = "1"; -const char sheet2[] PROGMEM = "2"; -const char sheet3[] PROGMEM = "3"; -const char *const defaultSheetNames[] PROGMEM = {sheet1,sheet2,sheet3}; - #ifdef TMC2130 void homeaxis(int axis, uint8_t cnt = 1, uint8_t* pstep = 0); #else diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 94314ddd..10080c07 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -72,11 +72,11 @@ void eeprom_init() } if(is_uninitialized) { + SheetName sheetName; + default_sheet_name(i,sheetName); - char sheet_PROGMEM_buffer[8]; - strcpy_P(sheet_PROGMEM_buffer, (char *)pgm_read_word(&(defaultSheetNames[i]))); for (uint_least8_t a = 0; a < sizeof(Sheet::name); ++a){ - eeprom_write(&(EEPROM_Sheets_base->s[i].name[a]), sheet_PROGMEM_buffer[a]); + eeprom_write(&(EEPROM_Sheets_base->s[i].name[a]), sheetName.c[a]); } // When upgrading from version older version (before multiple sheets were implemented in v3.8.0) @@ -90,6 +90,15 @@ void eeprom_init() check_babystep(); } - - - +//! @brief Get default sheet name for index +//! +//! @param[in] index +//! @param[out] sheetName +void default_sheet_name(uint8_t index, SheetName &sheetName) +{ + sheetName.c[0] = '1' + index; + for (uint8_t i = 1; i < (sizeof(sheetName.c)/sizeof(sheetName.c[0])); ++i) + { + sheetName.c[i] = '\0'; + } +} diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index c41fb9ff..23c812af 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -3,12 +3,6 @@ #include -#ifdef __cplusplus -void eeprom_init(); -extern bool is_sheet_initialized(uint8_t sheet_num); -#endif - - typedef struct { char name[7]; //!< Can be null terminated, doesn't need to be null terminated @@ -19,12 +13,12 @@ typedef struct typedef struct { - Sheet s[3]; + Sheet s[8]; uint8_t active_sheet; } Sheets; // sizeof(Sheets). Do not change it unless EEPROM_Sheets_base is last item in EEPROM. // Otherwise it would move following items. -#define EEPROM_SHEETS_SIZEOF 34 +#define EEPROM_SHEETS_SIZEOF 89 #ifdef __cplusplus static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEPROM_SHEETS_SIZEOF."); @@ -235,5 +229,14 @@ enum EEPROM_MMU_CUTTER_ENABLED_always = 2, }; +#ifdef __cplusplus +void eeprom_init(); +bool is_sheet_initialized(uint8_t sheet_num); +struct SheetName +{ + char c[sizeof(Sheet::name) + 1]; +}; +void default_sheet_name(uint8_t index, SheetName &sheetName); +#endif #endif // EEPROM_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3296ce55..b3d202c5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -244,10 +244,6 @@ void lcd_finishstatus(); static void lcd_sdcard_menu(); static void lcd_sheet_menu(); -static void lcd_select_sheet_0_menu(); -static void lcd_select_sheet_1_menu(); -static void lcd_select_sheet_2_menu(); - #ifdef DELTA_CALIBRATION_MENU static void lcd_delta_calibrate_menu(); #endif // DELTA_CALIBRATION_MENU @@ -5526,37 +5522,38 @@ SETTINGS_VERSION; MENU_END(); } +template +static void select_sheet_menu() +{ + selected_sheet = number; + lcd_sheet_menu(); +} + +static void sheets_menu() +{ + MENU_BEGIN(); + MENU_ITEM_BACK_P(_i("HW Setup")); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], select_sheet_menu<0>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], select_sheet_menu<1>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], select_sheet_menu<2>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[3], select_sheet_menu<3>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[4], select_sheet_menu<4>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[5], select_sheet_menu<5>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[6], select_sheet_menu<6>); + MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[7], select_sheet_menu<7>); + MENU_END(); +} + void lcd_hw_setup_menu(void) // can not be "static" { -MENU_BEGIN(); -MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch -//strncpy(buffer,_i("Sheet"),sizeof(buffer)); -//strncpy(buffer,_i(" "),sizeof(buffer)); -//strncpy(buffer,EEPROM_Sheets_base->s[0].name,sizeof(buffer)); + MENU_ITEM_SUBMENU_P(_i("Steel sheets"), sheets_menu); + SETTINGS_NOZZLE; + MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); -//const char* menu = EEPROM_Sheets_base->s[0].name.c_str(); - -//const char *b = new char(buffer); -//const char *b = const char *b = new char(buffer);(buffer); -//printf_P(_N("UVLO - end %d\n"), _millis() - time_start); -//SERIAL_ECHOPGM(buffer); -//SERIAL_ECHOPGM(reinterpret_cast(buffer)); -//SERIAL_ECHOPGM("lakdjushasdjaljsdakjsdn"); -//char* p = &buffer[0]; - -//MENU_ITEM_SUBMENU_P(reinterpret_cast(p),lcd_sheet_menu); - -//delete(b); - -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], lcd_select_sheet_0_menu); -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], lcd_select_sheet_1_menu); -MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], lcd_select_sheet_2_menu); - -SETTINGS_NOZZLE; -MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); - -MENU_END(); + MENU_END(); } static void lcd_settings_menu() @@ -6543,22 +6540,6 @@ static void change_sheet_from_menu() menu_back(); } -static void lcd_select_sheet_0_menu() -{ - selected_sheet = 0; - lcd_sheet_menu(); -} -static void lcd_select_sheet_1_menu() -{ - selected_sheet = 1; - lcd_sheet_menu(); -} -static void lcd_select_sheet_2_menu() -{ - selected_sheet = 2; - lcd_sheet_menu(); -} - static void lcd_rename_sheet_menu() { struct MenuData @@ -6605,11 +6586,10 @@ static void lcd_rename_sheet_menu() static void lcd_reset_sheet() { - char name[sizeof(Sheet::name)]; - - strcpy_P(name, (char *)pgm_read_word(&(defaultSheetNames[selected_sheet]))); + SheetName sheetName; + default_sheet_name(selected_sheet, sheetName); eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),0xffff); - eeprom_update_block(name,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); + eeprom_update_block(sheetName.c,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); if (selected_sheet == eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) { change_sheet_from_menu(); From 0b196da6fc5b2af796c9d3feff67085511beccab Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 18:07:49 +0200 Subject: [PATCH 067/104] Migrate old vale of EEPROM_BABYSTEP_Z only if active sheet is not initialized. --- Firmware/eeprom.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 10080c07..758bac6d 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -61,7 +61,14 @@ void eeprom_init() if (eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) == 0xffff) eeprom_update_word((uint16_t *)EEPROM_MMU_LOAD_FAIL_TOT, 0); if (eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL) == 0xff) eeprom_update_byte((uint8_t *)EEPROM_MMU_FAIL, 0); if (eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL) == 0xff) eeprom_update_byte((uint8_t *)EEPROM_MMU_LOAD_FAIL, 0); - if (eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)) == 0xff) eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), 0); + if (eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)) == 0xff) + { + eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), 0); + // When upgrading from version older version (before multiple sheets were implemented in v3.8.0) + // Sheet 1 uses the previous Live adjust Z (@EEPROM_BABYSTEP_Z) + int last_babystep = eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z); + eeprom_write_word(reinterpret_cast(&(EEPROM_Sheets_base->s[0].z_offset)), last_babystep); + } for (uint_least8_t i = 0; i < (sizeof(Sheets::s)/sizeof(Sheets::s[0])); ++i) { @@ -78,13 +85,6 @@ void eeprom_init() for (uint_least8_t a = 0; a < sizeof(Sheet::name); ++a){ eeprom_write(&(EEPROM_Sheets_base->s[i].name[a]), sheetName.c[a]); } - - // When upgrading from version older version (before multiple sheets were implemented in v3.8.0) - // Sheet 1 uses the previous Live adjust Z (@EEPROM_BABYSTEP_Z) - if(i == 0){ - int last_babystep = eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z); - eeprom_write_word(reinterpret_cast(&(EEPROM_Sheets_base->s[i].z_offset)), last_babystep); - } } } check_babystep(); From cd7805ba4629b525f219e0e998bef3c442fd641c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 18:26:24 +0200 Subject: [PATCH 068/104] Document --- Firmware/eeprom.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 23c812af..732cddff 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -30,9 +30,9 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_TOP 4096 #define EEPROM_SILENT 4095 #define EEPROM_LANG 4094 -#define EEPROM_BABYSTEP_X 4092 -#define EEPROM_BABYSTEP_Y 4090 -#define EEPROM_BABYSTEP_Z 4088 +#define EEPROM_BABYSTEP_X 4092 //unused +#define EEPROM_BABYSTEP_Y 4090 //unused +#define EEPROM_BABYSTEP_Z 4088 //legacy, multiple values stored now in EEPROM_Sheets_base #define EEPROM_CALIBRATION_STATUS 4087 #define EEPROM_BABYSTEP_Z0 4085 #define EEPROM_FILAMENTUSED 4081 From d647cdc02c703c7da01d66cd254905bea498de76 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 20:13:10 +0200 Subject: [PATCH 069/104] Convert sheet switcher from sub menu to function. Handle null characters in sheet name. --- Firmware/menu.cpp | 20 ++++++++++++++------ Firmware/menu.h | 4 ++-- Firmware/ultralcd.cpp | 4 +--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 7839bbdc..1b3830a7 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -203,9 +203,13 @@ void menu_format_sheet_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) void menu_format_sheet_select_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) { uint_least8_t index = sprintf_P(buffer.c,PSTR("%-9.9S["), _T(MSG_SHEET)); - eeprom_read_block(&(buffer.c[index]), sheet_E.name, 7); - buffer.c[index + 7] = ']'; - buffer.c[index + 8] = '\0'; + eeprom_read_block(&(buffer.c[index]), sheet_E.name, sizeof(sheet_E.name)/sizeof(sheet_E.name[0])); + for (const uint_least8_t start = index;index - start < sizeof(sheet_E.name)/sizeof(sheet_E.name[0]);++index) + { + if (buffer.c[index] == '\0') break; + } + buffer.c[index] = ']'; + buffer.c[index + 1] = '\0'; } static void menu_draw_item_select_sheet_E(char type_char, const Sheet &sheet) @@ -290,14 +294,18 @@ uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu) return 0; } -uint8_t menu_item_submenu_select_sheet_E(const Sheet &sheet, menu_func_t submenu) +uint8_t menu_item_function_E(const Sheet &sheet, menu_func_t func) { if (menu_item == menu_line) { - if (lcd_draw_update) menu_draw_item_select_sheet_E(LCD_STR_ARROW_RIGHT[0], sheet); + if (lcd_draw_update) menu_draw_item_select_sheet_E(' ', sheet); if (menu_clicked && (lcd_encoder == menu_item)) { - menu_submenu(submenu); + menu_clicked = false; + lcd_consume_click(); + lcd_update_enabled = 0; + if (func) func(); + lcd_update_enabled = 1; return menu_item_ret(); } } diff --git a/Firmware/menu.h b/Firmware/menu.h index d9bbf876..c07fe984 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -103,8 +103,8 @@ 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) extern uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu); -#define MENU_ITEM_SUBMENU_SELECT_SHEET_E(sheet, submenu) do { if (menu_item_submenu_select_sheet_E(sheet, submenu)) return; } while (0) -extern uint8_t menu_item_submenu_select_sheet_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) +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) extern uint8_t menu_item_back_P(const char* str); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b3d202c5..f4fe1ee1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6536,8 +6536,6 @@ static void change_sheet_from_menu() sheet = next_initialized_sheet(sheet); if (sheet >= 0) eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), sheet); - - menu_back(); } static void lcd_rename_sheet_menu() @@ -6716,7 +6714,7 @@ static void lcd_main_menu() const int8_t nextSheet = next_initialized_sheet(sheet); if ((nextSheet >= 0) && (sheet != nextSheet)) // show menu only if we have 2 or more sheets initialized { - MENU_ITEM_SUBMENU_SELECT_SHEET_E(EEPROM_Sheets_base->s[sheet], change_sheet_from_menu); + MENU_ITEM_FUNCTION_E(EEPROM_Sheets_base->s[sheet], change_sheet_from_menu); } } } From abf84e36f58c189de8caf301366de255fdb7b6a4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 20:23:02 +0200 Subject: [PATCH 070/104] Fix sheet menu back caption to Steel sheets to match parent menu caption. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f4fe1ee1..f0abdc4d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6603,7 +6603,7 @@ static void lcd_reset_sheet() static void lcd_sheet_menu() { MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_HW_SETUP)); + MENU_ITEM_BACK_P(_i("Steel sheets")); if(is_sheet_initialized(selected_sheet)){ MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 From 8c8619be051f35f418c1fe72c279d86bf4d014d4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 29 Aug 2019 20:52:53 +0200 Subject: [PATCH 071/104] Convert reset sheet sub menu to function. --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f0abdc4d..96ec847d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6597,7 +6597,7 @@ static void lcd_reset_sheet() } } - menu_back(2); + menu_back(); } static void lcd_sheet_menu() @@ -6611,7 +6611,7 @@ static void lcd_sheet_menu() MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_v2_calibration); MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); //// c=18 - MENU_ITEM_SUBMENU_P(_i("Reset"), lcd_reset_sheet); //// c=18 + MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_reset_sheet); //// c=18 MENU_END(); } From d8d0069f9712e03283afcd88d53b2663577eb9df Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 12:12:29 +0300 Subject: [PATCH 072/104] Fix MK2.x Default stepper power out of sync --- Firmware/stepper.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 860d761c..96ec5d66 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1562,7 +1562,8 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current { -uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); + uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); + if (silentMode == 0xff) silentMode = SILENT_MODE_POWER; SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); From 56c949b9af7919bdc03a9af82c104a653b8f4f9a Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 12:14:43 +0300 Subject: [PATCH 073/104] Fix typo --- Firmware/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 96ec5d66..8e8716eb 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1563,7 +1563,7 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current { uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); - if (silentMode == 0xff) silentMode = SILENT_MODE_POWER; + if (SilentMode == 0xff) SilentMode = SILENT_MODE_POWER; SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); From 50a8c16f276302c5794b5f238be624cc9eda2217 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 30 Aug 2019 12:00:33 +0200 Subject: [PATCH 074/104] Use EEPROM update instead of write. --- Firmware/eeprom.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 758bac6d..ed10fdcd 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -67,7 +67,7 @@ void eeprom_init() // When upgrading from version older version (before multiple sheets were implemented in v3.8.0) // Sheet 1 uses the previous Live adjust Z (@EEPROM_BABYSTEP_Z) int last_babystep = eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z); - eeprom_write_word(reinterpret_cast(&(EEPROM_Sheets_base->s[0].z_offset)), last_babystep); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[0].z_offset)), last_babystep); } for (uint_least8_t i = 0; i < (sizeof(Sheets::s)/sizeof(Sheets::s[0])); ++i) From 90e5f1430944490e8bcaf52f24dcaca5d83bbdc7 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 13:02:00 +0300 Subject: [PATCH 075/104] Fix compile error on MK3 --- Firmware/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 8e8716eb..5b102f42 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1563,7 +1563,7 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current { uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); - if (SilentMode == 0xff) SilentMode = SILENT_MODE_POWER; + if (SilentMode == 0xff) SilentMode = 0; //set power to High Power (MK2.5) or Normal Power (MK3, unused) SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); From 6c78c2fad58bf175667533d7c8035447c53d6fa3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 30 Aug 2019 12:02:48 +0200 Subject: [PATCH 076/104] Fix compiler warning. --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 1b3830a7..7aad723c 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -204,7 +204,7 @@ void menu_format_sheet_select_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) { uint_least8_t index = sprintf_P(buffer.c,PSTR("%-9.9S["), _T(MSG_SHEET)); eeprom_read_block(&(buffer.c[index]), sheet_E.name, sizeof(sheet_E.name)/sizeof(sheet_E.name[0])); - for (const uint_least8_t start = index;index - start < sizeof(sheet_E.name)/sizeof(sheet_E.name[0]);++index) + for (const uint_least8_t start = index; static_cast(index - start) < sizeof(sheet_E.name)/sizeof(sheet_E.name[0]); ++index) { if (buffer.c[index] == '\0') break; } From 26423f98bcb72bae58d27daeb6d618631f0b408b Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 30 Aug 2019 12:24:13 +0200 Subject: [PATCH 077/104] Switch to next sheet if currently selected sheet is not initialized. Move next_initialized_sheet() and change_sheet_from_menu() to eeprom.cpp, rename it to eeprom_next_initialized_sheet() and eeprom_switch_to_next_sheet(). Rename default_sheet_name() to eeprom_default_sheet_name(). --- Firmware/eeprom.cpp | 37 ++++++++++++++++++++++++++++++++++--- Firmware/eeprom.h | 6 ++++-- Firmware/ultralcd.cpp | 38 +++++++------------------------------- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index ed10fdcd..60b5c946 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -41,7 +41,8 @@ bool eeprom_is_uninitialized(char *address) return (0xff == eeprom_read_byte(reinterpret_cast(address))); } -bool is_sheet_initialized(uint8_t sheet_num){ +bool eeprom_is_sheet_initialized(uint8_t sheet_num) +{ return (0xffff != eeprom_read_word(reinterpret_cast(&(EEPROM_Sheets_base-> s[sheet_num].z_offset)))); } @@ -80,13 +81,17 @@ void eeprom_init() if(is_uninitialized) { SheetName sheetName; - default_sheet_name(i,sheetName); + eeprom_default_sheet_name(i,sheetName); for (uint_least8_t a = 0; a < sizeof(Sheet::name); ++a){ eeprom_write(&(EEPROM_Sheets_base->s[i].name[a]), sheetName.c[a]); } } } + if(!eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))) + { + eeprom_switch_to_next_sheet(); + } check_babystep(); } @@ -94,7 +99,7 @@ void eeprom_init() //! //! @param[in] index //! @param[out] sheetName -void default_sheet_name(uint8_t index, SheetName &sheetName) +void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName) { sheetName.c[0] = '1' + index; for (uint8_t i = 1; i < (sizeof(sheetName.c)/sizeof(sheetName.c[0])); ++i) @@ -102,3 +107,29 @@ void default_sheet_name(uint8_t index, SheetName &sheetName) sheetName.c[i] = '\0'; } } + +//! @brief Get next initialized sheet +//! +//! If current sheet is the only sheet initialized, current sheet is returned. +//! +//! @param sheet Current sheet +//! @return next initialized sheet +//! @retval -1 no sheet is initialized +int8_t eeprom_next_initialized_sheet(int8_t sheet) +{ + for (int8_t i = 0; i < static_cast(sizeof(Sheets::s)/sizeof(Sheet)); ++i) + { + ++sheet; + if (sheet >= static_cast(sizeof(Sheets::s)/sizeof(Sheet))) sheet = 0; + if (eeprom_is_sheet_initialized(sheet)) return sheet; + } + return -1; +} + +void eeprom_switch_to_next_sheet() +{ + int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); + + sheet = eeprom_next_initialized_sheet(sheet); + if (sheet >= 0) eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), sheet); +} diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 732cddff..482ddf93 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -231,12 +231,14 @@ enum #ifdef __cplusplus void eeprom_init(); -bool is_sheet_initialized(uint8_t sheet_num); +bool eeprom_is_sheet_initialized(uint8_t sheet_num); struct SheetName { char c[sizeof(Sheet::name) + 1]; }; -void default_sheet_name(uint8_t index, SheetName &sheetName); +void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName); +int8_t eeprom_next_initialized_sheet(int8_t sheet); +void eeprom_switch_to_next_sheet(); #endif #endif // EEPROM_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 96ec847d..6f49f925 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3098,7 +3098,7 @@ static void lcd_babystep_z() _md->status = 1; check_babystep(); - if(!is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))){ + if(!eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))){ _md->babystepMemZ = 0; } else{ @@ -6512,31 +6512,7 @@ static void change_sheet() menu_back(3); } -//! @brief Get next initialized sheet -//! -//! If current sheet is the only sheet initialized, current sheet is returned. -//! -//! @param sheet Current sheet -//! @return next initialized sheet -//! @retval -1 no sheet is initialized -static int8_t next_initialized_sheet(int8_t sheet) -{ - for (int8_t i = 0; i < static_cast(sizeof(Sheets::s)/sizeof(Sheet)); ++i) - { - ++sheet; - if (sheet >= static_cast(sizeof(Sheets::s)/sizeof(Sheet))) sheet = 0; - if (is_sheet_initialized(sheet)) return sheet; - } - return -1; -} -static void change_sheet_from_menu() -{ - int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); - - sheet = next_initialized_sheet(sheet); - if (sheet >= 0) eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), sheet); -} static void lcd_rename_sheet_menu() { @@ -6585,13 +6561,13 @@ static void lcd_rename_sheet_menu() static void lcd_reset_sheet() { SheetName sheetName; - default_sheet_name(selected_sheet, sheetName); + eeprom_default_sheet_name(selected_sheet, sheetName); eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),0xffff); eeprom_update_block(sheetName.c,EEPROM_Sheets_base->s[selected_sheet].name,sizeof(Sheet::name)); if (selected_sheet == eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) { - change_sheet_from_menu(); - if((-1 == next_initialized_sheet(0)) && (CALIBRATION_STATUS_CALIBRATED == calibration_status())) + eeprom_switch_to_next_sheet(); + if((-1 == eeprom_next_initialized_sheet(0)) && (CALIBRATION_STATUS_CALIBRATED == calibration_status())) { calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST); } @@ -6605,7 +6581,7 @@ static void lcd_sheet_menu() MENU_BEGIN(); MENU_ITEM_BACK_P(_i("Steel sheets")); - if(is_sheet_initialized(selected_sheet)){ + if(eeprom_is_sheet_initialized(selected_sheet)){ MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 } @@ -6711,10 +6687,10 @@ static void lcd_main_menu() if (!farm_mode) { const int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); - const int8_t nextSheet = next_initialized_sheet(sheet); + const int8_t nextSheet = eeprom_next_initialized_sheet(sheet); if ((nextSheet >= 0) && (sheet != nextSheet)) // show menu only if we have 2 or more sheets initialized { - MENU_ITEM_FUNCTION_E(EEPROM_Sheets_base->s[sheet], change_sheet_from_menu); + MENU_ITEM_FUNCTION_E(EEPROM_Sheets_base->s[sheet], eeprom_switch_to_next_sheet); } } } From 3d292350d4e896fcb871569339bafe3d4da11baf Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 30 Aug 2019 14:45:25 +0200 Subject: [PATCH 078/104] Do not activate selected_sheet in lcd_v2_calibration() as this leads to calibrating random sheet if activated from calibration menu. selected_sheet is initialized to 0 and contains index of last Sheet menu visited. --- Firmware/ultralcd.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6f49f925..f1334551 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4690,7 +4690,6 @@ void lcd_toshiba_flash_air_compatibility_toggle() void lcd_v2_calibration() { - eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), selected_sheet); if (mmu_enabled) { const uint8_t filament = choose_menu_P(_i("Select PLA filament:"),_T(MSG_FILAMENT),_i("Cancel")); ////c=20 r=1 ////c=19 r=1 @@ -6576,6 +6575,13 @@ static void lcd_reset_sheet() menu_back(); } +//! @brief Activate selected_sheet and run first layer calibration +static void activate_calibrate_sheet() +{ + eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), selected_sheet); + lcd_v2_calibration(); +} + static void lcd_sheet_menu() { MENU_BEGIN(); @@ -6585,7 +6591,7 @@ static void lcd_sheet_menu() MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 } - MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_v2_calibration); + MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet); MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); //// c=18 MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_reset_sheet); //// c=18 From 865484590b46fd14f331efe81bb0b65718136f5a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 30 Aug 2019 16:11:41 +0200 Subject: [PATCH 079/104] Change default sheet name from "" to "Sheet ". --- Firmware/eeprom.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 60b5c946..dd1a410b 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -101,11 +101,11 @@ void eeprom_init() //! @param[out] sheetName void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName) { - sheetName.c[0] = '1' + index; - for (uint8_t i = 1; i < (sizeof(sheetName.c)/sizeof(sheetName.c[0])); ++i) - { - sheetName.c[i] = '\0'; - } + static_assert(8 == sizeof(SheetName),"Default sheet name needs to be adjusted."); + sprintf_P(sheetName.c, PSTR("%-6.6S"), _T(MSG_SHEET)); + + sheetName.c[6] = '1' + index; + sheetName.c[7] = '\0'; } //! @brief Get next initialized sheet From 3a5daf1c64e889951703176be2a958ef030b27e7 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 5 Sep 2019 17:27:21 +0200 Subject: [PATCH 080/104] Change default sheet names. --- Firmware/eeprom.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index dd1a410b..b33b2c3c 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -97,14 +97,66 @@ void eeprom_init() //! @brief Get default sheet name for index //! +//! | index | sheetName | +//! | ----- | --------- | +//! | 0 | Smooth1 | +//! | 1 | Smooth2 | +//! | 2 | Textur1 | +//! | 3 | Textur2 | +//! | 4 | Custom1 | +//! | 5 | Custom2 | +//! | 6 | Custom3 | +//! | 7 | Custom4 | +//! //! @param[in] index //! @param[out] sheetName void eeprom_default_sheet_name(uint8_t index, SheetName &sheetName) { static_assert(8 == sizeof(SheetName),"Default sheet name needs to be adjusted."); - sprintf_P(sheetName.c, PSTR("%-6.6S"), _T(MSG_SHEET)); - sheetName.c[6] = '1' + index; + if (index < 2) + { + strcpy_P(sheetName.c, PSTR("Smooth")); + } + else if (index < 4) + { + strcpy_P(sheetName.c, PSTR("Textur")); + } + else + { + strcpy_P(sheetName.c, PSTR("Custom")); + } + + switch (index) + { + case 0: + sheetName.c[6] = '1'; + break; + case 1: + sheetName.c[6] = '2'; + break; + case 2: + sheetName.c[6] = '1'; + break; + case 3: + sheetName.c[6] = '2'; + break; + case 4: + sheetName.c[6] = '1'; + break; + case 5: + sheetName.c[6] = '2'; + break; + case 6: + sheetName.c[6] = '3'; + break; + case 7: + sheetName.c[6] = '4'; + break; + default: + break; + } + sheetName.c[7] = '\0'; } From e73b0a88d5c02c74f1fb86157541848a4906fea9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 5 Sep 2019 22:35:01 +0200 Subject: [PATCH 081/104] Use same format for all instances where "ok" is send to serial line. --- 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 a034f94e..447cc082 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10207,7 +10207,7 @@ void restore_print_from_ram_and_continue(float e_move) else { //not sd printing nor usb printing } - printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this + SERIAL_PROTOCOLLNRPGM(MSG_OK); //dummy response because of octoprint is waiting for this lcd_setstatuspgm(_T(WELCOME_MSG)); saved_printing = false; } From 441e24acbdb58cd81c32cecfac490fa42e158447 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 08:30:10 +0200 Subject: [PATCH 082/104] update translated UI texts --- lang/lang-export.sh | 2 +- lang/lang-import.sh | 2 +- lang/lang_en.txt | 144 +++++ lang/lang_en_cz.txt | 204 ++++++- lang/lang_en_de.txt | 204 ++++++- lang/lang_en_es.txt | 208 ++++++- lang/lang_en_fr.txt | 196 ++++++- lang/lang_en_it.txt | 220 +++++++- lang/lang_en_pl.txt | 210 +++++++- lang/po/Firmware.pot | 978 +++++++++++++++++---------------- lang/po/Firmware_cs.po | 1054 +++++++++++++++++++----------------- lang/po/Firmware_de.po | 1065 +++++++++++++++++++----------------- lang/po/Firmware_es.po | 1058 +++++++++++++++++++----------------- lang/po/Firmware_fr.po | 1168 +++++++++++++++++++++------------------- lang/po/Firmware_it.po | 1058 +++++++++++++++++++----------------- lang/po/Firmware_pl.po | 1056 +++++++++++++++++++----------------- lang/po/new/cs.po | 851 ++++++++++++++++++++--------- lang/po/new/de.po | 862 ++++++++++++++++++++--------- lang/po/new/es.po | 892 ++++++++++++++++++++---------- lang/po/new/fr.po | 850 ++++++++++++++++++++--------- lang/po/new/it.po | 880 ++++++++++++++++++++---------- lang/po/new/pl.po | 864 ++++++++++++++++++++--------- 22 files changed, 8876 insertions(+), 5150 deletions(-) diff --git a/lang/lang-export.sh b/lang/lang-export.sh index 4fa6bc59..ab123dbe 100755 --- a/lang/lang-export.sh +++ b/lang/lang-export.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-export.sh - multi-language support script # for generating lang_xx.po diff --git a/lang/lang-import.sh b/lang/lang-import.sh index 6176e053..092afb98 100755 --- a/lang/lang-import.sh +++ b/lang/lang-import.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # lang-import.sh - multi-language support script # for importing translated xx.po diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 2da37fc0..272c800c 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -930,3 +930,147 @@ #MSG_OFF " [off]" + +# +"Back" + +# +"Checks" + +# +"False triggering" + +# +"FINDA:" + +# +"Firmware [none]" + +# +"Firmware [strict]" + +# +"Firmware [warn]" + +# +"HW Setup" + +# +"IR:" + +# +"Magnets comp.[N/A]" + +# +"Magnets comp.[Off]" + +# +"Magnets comp. [On]" + +# +"Mesh [3x3]" + +# +"Mesh [7x7]" + +# +"Mesh bed leveling" + +# +"MK3S firmware detected on MK3 printer" + +# +"MMU Mode [Normal]" + +# +"MMU Mode[Stealth]" + +# +"Mode change in progress ..." + +# +"Model [none]" + +# +"Model [strict]" + +# +"Model [warn]" + +# +"Nozzle d. [0.25]" + +# +"Nozzle d. [0.40]" + +# +"Nozzle d. [0.60]" + +# +"Nozzle [none]" + +# +"Nozzle [strict]" + +# +"Nozzle [warn]" + +# +"G-code sliced for a different level. Continue?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." + +# +"G-code sliced for a different printer type. Continue?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." + +# +"G-code sliced for a newer firmware. Continue?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." + +# +"PINDA:" + +# +"Preheating to cut" + +# +"Preheating to eject" + +# +"Printer nozzle diameter differs from the G-code. Continue?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." + +# +"Rename" + +# +"Select" + +# +"Sensor info" + +# +"Sheet" + +# +"Sound [assist]" + +# +"Steel sheets" + +# +"Z-correct:" + +# +"Z-probe nr. [1]" + +# +"Z-probe nr. [3]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ed682e81..4b6f9b17 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Dostavovani Z:" +"Doladeni Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -316,7 +316,7 @@ # "Filam. runouts" -"Vypadky filamentu" +"Vypadky filam." #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -792,7 +792,7 @@ #MSG_WIZARD_HEATING c=20 r=3 "Preheating nozzle. Please wait." -"Predehrivam trysku. Prosim cekejte." +"Predehrev trysky. Prosim cekejte." # "Please upgrade." @@ -812,11 +812,11 @@ # "Preheating to load" -"Predehrivam k zavedeni" +"Predehrev k zavedeni" # "Preheating to unload" -"Predehrivam k vyjmuti" +"Predehrev k vyjmuti" #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" @@ -828,7 +828,7 @@ # "Press the knob" -"Stisknete tlacitko" +"Stisknete hl. tlacitko" #MSG_PRINT_PAUSED c=20 r=1 "Print paused" @@ -1240,4 +1240,196 @@ #MSG_OFF " [off]" +" [vyp]" + +# +"Back" +"Zpet" + +# +"Checks" +"Kontrola" + +# +"False triggering" +"Falesne spusteni" + +# +"FINDA:" "\x00" + +# +"Firmware [none]" +"Firmware [Zadne]" + +# +"Firmware [strict]" +"Firmware [Prisne]" + +# +"Firmware [warn]" +"Firmware[Varovat]" + +# +"HW Setup" +"HW nastaveni" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Komp. magnetu[N/A]" + +# +"Magnets comp.[Off]" +"Komp. magnetu[Vyp]" + +# +"Magnets comp. [On]" +"Komp. magnetu[Zap]" + +# +"Mesh [3x3]" +"Mesh [3x3]" + +# +"Mesh [7x7]" +"Mesh [7x7]" + +# +"Mesh bed leveling" +"Mesh Bed Leveling" + +# +"MK3S firmware detected on MK3 printer" +"MK3S firmware detekovan na tiskarne MK3" + +# +"MMU Mode [Normal]" +"MMU mod [Normal]" + +# +"MMU Mode[Stealth]" +"MMU Mod [Tichy]" + +# +"Mode change in progress ..." +"Probiha zmena modu..." + +# +"Model [none]" +"Model [Zadne]" + +# +"Model [strict]" +"Model [Prisne]" + +# +"Model [warn]" +"Model [Varovat]" + +# +"Nozzle d. [0.25]" +"Tryska [0.25]" + +# +"Nozzle d. [0.40]" +"Tryska [0.40]" + +# +"Nozzle d. [0.60]" +"Tryska [0.60]" + +# +"Nozzle [none]" +"Tryska [Zadne]" + +# +"Nozzle [strict]" +"Tryska [Prisne]" + +# +"Nozzle [warn]" +"Tryska [Varovat]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"\x00" + +# +"G-code sliced for a different printer type. Continue?" +"G-code je pripraven pro jiny typ tiskarny. Pokracovat?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code je pripraven pro novejsi firmware. Pokracovat?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Predehrev k ustrizeni" + +# +"Preheating to eject" +"Predehrev k vysunuti" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + +# +"Rename" +"Prejmenovat" + +# +"Select" +"Vybrat" + +# +"Sensor info" +"Senzor info" + +# +"Sheet" +"Plat" + +# +"Sound [assist]" +"Zvuk [Asist.]" + +# +"Steel sheets" +"Tiskove platy" + +# +"Z-correct:" +"Korekce Z:" + +# +"Z-probe nr. [1]" +"Pocet mereni Z [1]" + +# +"Z-probe nr. [3]" +"Pocet mereni Z [3]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index cb73f8f2..70ca591c 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Z Einstellung:" +"Z Anpassen:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -884,7 +884,7 @@ #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" -"Rechts [um]" +"Rechts [um]" #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" @@ -928,7 +928,7 @@ #MSG_SELFTEST "Selftest " -"Selbsttest " +"Selbsttest " #MSG_SELFTEST_ERROR "Selftest error !" @@ -972,7 +972,7 @@ #MSG_SORT_NONE c=17 r=1 "Sort [none]" -"Sort. [Keine]" +"Sort. [ohne]" #MSG_SORT_TIME c=17 r=1 "Sort [time]" @@ -1036,7 +1036,7 @@ #MSG_STOPPED "STOPPED. " -"GESTOPPT. " +"GESTOPPT." #MSG_SUPPORT "Support" @@ -1048,7 +1048,7 @@ #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " -"Temp Kalib. " +"Temp Kalib. " #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" @@ -1241,4 +1241,196 @@ #MSG_OFF " [off]" +" [aus]" + +# +"Back" +"Zurueck" + +# +"Checks" "\x00" + +# +"False triggering" +"Falschtriggerung" + +# +"FINDA:" +"\x00" + +# +"Firmware [none]" +"Firmware [ohne]" + +# +"Firmware [strict]" +"Firmware [streng]" + +# +"Firmware [warn]" +"\x00" + +# +"HW Setup" +"HW Einstellungen" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Magnet Komp. [nv]" + +# +"Magnets comp.[Off]" +"Magnet Komp. [Aus]" + +# +"Magnets comp. [On]" +"Magnet Komp. [An]" + +# +"Mesh [3x3]" +"\x00" + +# +"Mesh [7x7]" +"\x00" + +# +"Mesh bed leveling" +"Mesh Bett Ausgleich" + +# +"MK3S firmware detected on MK3 printer" +"MK3S-Firmware auf MK3-Drucker erkannt" + +# +"MMU Mode [Normal]" +"MMU Modus[Normal]" + +# +"MMU Mode[Stealth]" +"MMU Mod.[Stealth]" + +# +"Mode change in progress ..." +"Moduswechsel erfolgt..." + +# +"Model [none]" +"Modell [ohne]" + +# +"Model [strict]" +"Modell [streng]" + +# +"Model [warn]" +"Modell [warn]" + +# +"Nozzle d. [0.25]" +"Duese D. [0.25]" + +# +"Nozzle d. [0.40]" +"Duese D. [0.40]" + +# +"Nozzle d. [0.60]" +"Duese D. [0.60]" + +# +"Nozzle [none]" +"Duese [ohne]" + +# +"Nozzle [strict]" +"Duese [streng]" + +# +"Nozzle [warn]" +"Duese [warn]" + +# +"G-code sliced for a different level. Continue?" +"G-Code ist fuer einen anderen Level geslict. Fortfahren?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +"G-code sliced for a different printer type. Continue?" +"G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +"G-code sliced for a newer firmware. Continue?" +"G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Heizen zum Schnitt" + +# +"Preheating to eject" +"Heizen zum Auswurf" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +"Rename" +"Umbenennen" + +# +"Select" +"Auswahl" + +# +"Sensor info" +"Sensor Info" + +# +"Sheet" +"Blech" + +# +"Sound [assist]" +"\x00" + +# +"Steel sheets" +"Stahlbleche" + +# +"Z-correct:" +"Z-Korrektur:" + +# +"Z-probe nr. [1]" +"Z-Probe Nr. [1]" + +# +"Z-probe nr. [3]" +"Z-Probe Nr. [3]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index a48da96f..b624457e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajustar Z:" +"Ajustando Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -216,7 +216,7 @@ #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" -"E-correcion:" +"Correccion-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -672,7 +672,7 @@ #MSG_WIZARD_WILL_PREHEAT c=20 r=4 "Now I will preheat nozzle for PLA." -"Voy a precalentar la boquilla para PLA ahora." +"Ahora precalentare la boquilla para PLA." #MSG_NOZZLE "Nozzle" @@ -880,7 +880,7 @@ #MSG_RESUMING_PRINT c=20 r=1 "Resuming print" -"Resumiendo impresion" +"Continuando impresion" #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" @@ -972,11 +972,11 @@ #MSG_SORT_NONE c=17 r=1 "Sort [none]" -"Ordenar [nada]" +"Ordenar [ninguno]" #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Ordenar [Fecha]" +"Ordenar [tiempo]" # "Severe skew" @@ -1200,7 +1200,7 @@ # "X-correct:" -"X-correcion:" +"Correccion-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1236,8 +1236,200 @@ # "Y-correct:" -"Y-correcion:" +"Correccion-Y:" #MSG_OFF " [off]" +" [apagado]" + +# +"Back" +"atras" + +# +"Checks" +"Comprobaciones" + +# +"False triggering" +"Falsa activacion" + +# +"FINDA:" "\x00" + +# +"Firmware [none]" +"Firmware[ninguno]" + +# +"Firmware [strict]" +"Firmware[estrict]" + +# +"Firmware [warn]" +"Firmware [aviso]" + +# +"HW Setup" +"Configuracion HW" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Comp. imanes [N/A]" + +# +"Magnets comp.[Off]" +"Comp. imanes [Off]" + +# +"Magnets comp. [On]" +"Comp. imanes [On]" + +# +"Mesh [3x3]" +"Malla [3x3]" + +# +"Mesh [7x7]" +"Malla [7x7]" + +# +"Mesh bed leveling" +"Nivelacion Malla Base" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S detectado en impresora MK3" + +# +"MMU Mode [Normal]" +"Modo MMU [Normal]" + +# +"MMU Mode[Stealth]" +"Modo MMU[Silenci]" + +# +"Mode change in progress ..." +"Cambio de modo progresando ..." + +# +"Model [none]" +"Modelo [ninguno]" + +# +"Model [strict]" +"Modelo [estricto]" + +# +"Model [warn]" +"Modelo [aviso]" + +# +"Nozzle d. [0.25]" +"Diam. nozzl[0.25]" + +# +"Nozzle d. [0.40]" +"Diam. nozzl[0.40]" + +# +"Nozzle d. [0.60]" +"Diam. nozzl[0.60]" + +# +"Nozzle [none]" +"Nozzle [ninguno]" + +# +"Nozzle [strict]" +"Nozzle [estricto]" + +# +"Nozzle [warn]" +"Nozzle [aviso]" + +# +"G-code sliced for a different level. Continue?" +"Codigo G laminado para un nivel diferente. ?Continuar?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +"G-code sliced for a different printer type. Continue?" +"Codigo G laminado para un tipo de impresora diferente. ?Continuar?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +"G-code sliced for a newer firmware. Continue?" +"Codigo G laminado para nuevo firmware. ?Continuar?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Precalentando para laminar" + +# +"Preheating to eject" +"Precalentar para expulsar" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametro nozzle impresora difiere de cod.G. ?Continuar?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." + +# +"Rename" +"Renombrar" + +# +"Select" +"Seleccionar" + +# +"Sensor info" +"Info sensor" + +# +"Sheet" +"Lamina" + +# +"Sound [assist]" +"Sonido [asistido]" + +# +"Steel sheets" +"Lamina de acero" + +# +"Z-correct:" +"Correccion-Z:" + +# +"Z-probe nr. [1]" +"Z-sensor nr. [1]" + +# +"Z-probe nr. [3]" +"Z-sensor nr. [3]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 320b91d9..243a50e5 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajust. de Z:" +"Ajuster Z :" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -972,7 +972,7 @@ #MSG_SORT_NONE c=17 r=1 "Sort [none]" -"Tri : [aucun]" +"Tri [aucun]" #MSG_SORT_TIME c=17 r=1 "Sort [time]" @@ -1240,4 +1240,196 @@ #MSG_OFF " [off]" +" [off]" + +# +"Back" +"Retour" + +# +"Checks" +"Verifications" + +# +"False triggering" +"Faux declenchement" + +# +"FINDA:" +"FINDA:" + +# +"Firmware [none]" +"Firmware [aucune]" + +# +"Firmware [strict]" +"Firmware[stricte]" + +# +"Firmware [warn]" +"Firmware [avert]" + +# +"HW Setup" +"Config HW" + +# +"IR:" +"IR:" + +# +"Magnets comp.[N/A]" +"Comp. aimants[N/A]" + +# +"Magnets comp.[Off]" +"Comp. aimants[Off]" + +# +"Magnets comp. [On]" +"Comp. aimants [On]" + +# +"Mesh [3x3]" "\x00" + +# +"Mesh [7x7]" +"\x00" + +# +"Mesh bed leveling" +"\x00" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S detecte sur imprimante MK3" + +# +"MMU Mode [Normal]" +"Mode MMU [Normal]" + +# +"MMU Mode[Stealth]" +"Mode MMU [Furtif]" + +# +"Mode change in progress ..." +"Changement de mode en cours..." + +# +"Model [none]" +"Modele [aucune]" + +# +"Model [strict]" +"Modele [stricte]" + +# +"Model [warn]" +"Modele [avert]" + +# +"Nozzle d. [0.25]" +"Diam. buse [0.25]" + +# +"Nozzle d. [0.40]" +"Diam. buse [0.40]" + +# +"Nozzle d. [0.60]" +"Diam. buse [0.60]" + +# +"Nozzle [none]" +"Buse [aucune]" + +# +"Nozzle [strict]" +"Buse [stricte]" + +# +"Nozzle [warn]" +"Buse [avert]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"\x00" + +# +"G-code sliced for a different printer type. Continue?" +"Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee. " + +# +"G-code sliced for a newer firmware. Continue?" +"Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." + +# +"PINDA:" +"PINDA:" + +# +"Preheating to cut" +"Prechauffage pour couper" + +# +"Preheating to eject" +"Prechauffage pour ejecter" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametre de la buse de l'imprimante different du G-Code. Continuer ?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametre de la buse de l'imprimante different du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +"Rename" +"Renommer" + +# +"Select" +"Selectionner" + +# +"Sensor info" +"Info capteur" + +# +"Sheet" +"Feuille" + +# +"Sound [assist]" +"Son [Assist]" + +# +"Steel sheets" +"Plaques en acier" + +# +"Z-correct:" +"Correct-Z:" + +# +"Z-probe nr. [1]" +"Sonde-Z num. [1]" + +# +"Z-probe nr. [3]" +"Sonde-Z num. [3]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0b82c587..f18114e9 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -15,7 +15,7 @@ "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -"WARNING:\x0aCrash detection disabled in Stealth mode" +"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # @@ -296,7 +296,7 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Controllo ventole [on]" +"Control.vent [on]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" @@ -512,7 +512,7 @@ #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" -"Lato sinistro [um]" +"Sinistra [um]" # "Lin. correction" @@ -568,7 +568,7 @@ # "Measured skew" -"Disassamento misurato" +"Deviazione misurata" # "MMU fails" @@ -628,15 +628,15 @@ #MSG_MOVE_X "Move X" -"Muovi X" +"Sposta X" #MSG_MOVE_Y "Move Y" -"Muovi Y" +"Sposta Y" #MSG_MOVE_Z "Move Z" -"Muovi Z" +"Sposta Z" #MSG_NO_MOVE "No move." @@ -680,7 +680,7 @@ #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -"Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" +"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # "Now remove the test print from steel sheet." @@ -972,19 +972,19 @@ #MSG_SORT_NONE c=17 r=1 "Sort [none]" -"Ordina [none]" +"Ordina [nessuno]" #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Ordina [time]" +"Ordina [tempo]" # "Severe skew" -"Disassamento grave" +"Deviazione grave" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" -"Ordine [alfabet]" +"Ordine [alfabeti]" #MSG_SORTING c=20 r=1 "Sorting files" @@ -996,7 +996,7 @@ # "Slight skew" -"Disassamento lieve" +"Deviazione lieve" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" @@ -1112,7 +1112,7 @@ #MSG_UNLOAD_FILAMENT c=17 "Unload filament" -"Scarica filam." +"Scarica filamento" #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" @@ -1241,3 +1241,195 @@ #MSG_OFF " [off]" "\x00" + +# +"Back" +"Indietro" + +# +"Checks" +"Controlli" + +# +"False triggering" +"Falso innesco" + +# +"FINDA:" +"\x00" + +# +"Firmware [none]" +"Firmware[nessuno]" + +# +"Firmware [strict]" +"Firmware [esatto]" + +# +"Firmware [warn]" +"Firmware [avviso]" + +# +"HW Setup" +"Installazione HW" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Comp. Magneti[N/A]" + +# +"Magnets comp.[Off]" +"Comp. Magneti[off]" + +# +"Magnets comp. [On]" +"Comp. Magneti [on]" + +# +"Mesh [3x3]" +"Griglia [3x3]" + +# +"Mesh [7x7]" +"Griglia [7x7]" + +# +"Mesh bed leveling" +"Mesh livel. letto" + +# +"MK3S firmware detected on MK3 printer" +"Firmware MK3S rilevato su stampante MK3" + +# +"MMU Mode [Normal]" +"Modalita MMU [Normale]" + +# +"MMU Mode[Stealth]" +"Modalita MMU [Silenziosa]" + +# +"Mode change in progress ..." +"Cambio modalita in corso ..." + +# +"Model [none]" +"Modello [nessuno]" + +# +"Model [strict]" +"Modello [esatto]" + +# +"Model [warn]" +"Modello [avviso]" + +# +"Nozzle d. [0.25]" +"Diam.Ugello[0.25]" + +# +"Nozzle d. [0.40]" +"Diam.Ugello[0.40]" + +# +"Nozzle d. [0.60]" +"Diam.Ugello[0.60]" + +# +"Nozzle [none]" +"Ugello [nessuno]" + +# +"Nozzle [strict]" +"Ugello [esatto]" + +# +"Nozzle [warn]" +"Ugello [avviso]" + +# +"G-code sliced for a different level. Continue?" +"G-code processato per un livello diverso. Continuare?" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +"G-code sliced for a different printer type. Continue?" +"G-code processato per una stampante diversa. Continuare?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code processato per un firmware piu recente. Continuare?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Preriscaldamento per taglio" + +# +"Preheating to eject" +"Preriscaldamento per espulsione" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Diametro ugello diverso da G-Code. Continuare?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +"Rename" +"Rinomina" + +# +"Select" +"Seleziona" + +# +"Sensor info" +"Info Sensore" + +# +"Sheet" +"Piano" + +# +"Sound [assist]" +"Suono [assistito]" + +# +"Steel sheets" +"Piani d'acciaio" + +# +"Z-correct:" +"Correzione-Z:" + +# +"Z-probe nr. [1]" +"Z-probe nr. [1]" + +# +"Z-probe nr. [3]" +"Z-probe nr. [3]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 47e0fbb0..65e01651 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Dostrajanie Z:" +"Ustawianie Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -44,7 +44,7 @@ #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 "Are left and right Z~carriages all up?" -"Obydwa konce osi dojechaly do gornych ogranicznikow?" +"Obydwa konce osi sa na szczycie?" #MSG_AUTO_DEPLETE_ON c=17 r=1 "SpoolJoin [on]" @@ -216,7 +216,7 @@ #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" -"Korekcja E:" +"Korekcja-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -972,11 +972,11 @@ #MSG_SORT_NONE c=17 r=1 "Sort [none]" -"Sortuj [brak]" +"Sortowanie [brak]" #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Sortuj [czas]" +"Sortowanie [czas]" # "Severe skew" @@ -984,7 +984,7 @@ #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" -"Sortuj [alfabet]" +"Sortowan[alfabet]" #MSG_SORTING c=20 r=1 "Sorting files" @@ -1032,7 +1032,7 @@ #MSG_STOP_PRINT "Stop print" -"Zatrzymac druk" +"Przerwanie druku" #MSG_STOPPED "STOPPED. " @@ -1200,7 +1200,7 @@ # "X-correct:" -"Korekcja X:" +"Korekcja-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1236,8 +1236,200 @@ # "Y-correct:" -"Korekcja Y:" +"Korekcja-Y:" #MSG_OFF " [off]" +" [wyl]" + +# +"Back" +"Wstecz" + +# +"Checks" +"Testy" + +# +"False triggering" +"Falszywy alarm" + +# +"FINDA:" "\x00" + +# +"Firmware [none]" +"Firmware [brak]" + +# +"Firmware [strict]" +"Firmware [restr.]" + +# +"Firmware [warn]" +"Firmware[ostrzez]" + +# +"HW Setup" +"Ustawienia HW" + +# +"IR:" +"\x00" + +# +"Magnets comp.[N/A]" +"Kor. magnesow [nd]" + +# +"Magnets comp.[Off]" +"Kor. magnesow[wyl]" + +# +"Magnets comp. [On]" +"Kor. magnesow [wl]" + +# +"Mesh [3x3]" +"Siatka [3x3]" + +# +"Mesh [7x7]" +"Siatka [7x7]" + +# +"Mesh bed leveling" +"Poziomowanie wg siatki" + +# +"MK3S firmware detected on MK3 printer" +"Wykryto firmware MK3S w drukarce MK3" + +# +"MMU Mode [Normal]" +"Tryb MMU[Normaln]" + +# +"MMU Mode[Stealth]" +"Tryb MMU[Stealth]" + +# +"Mode change in progress ..." +"Trwa zmiana trybu..." + +# +"Model [none]" +"Model [brak]" + +# +"Model [strict]" +"Model [restrykc.]" + +# +"Model [warn]" +"Model [ostrzez.]" + +# +"Nozzle d. [0.25]" +"Sr. dyszy [0,25]" + +# +"Nozzle d. [0.40]" +"Sr. dyszy [0,40]" + +# +"Nozzle d. [0.60]" +"Sr. dyszy [0,60]" + +# +"Nozzle [none]" +"Dysza [brak]" + +# +"Nozzle [strict]" +"Dysza [restrykc.]" + +# +"Nozzle [warn]" +"Dysza [ostrzez.]" + +# +"G-code sliced for a different level. Continue?" +"\x00" + +# +"G-code sliced for a different level. Please re-slice the model again. Print cancelled." +"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." + +# +"G-code sliced for a different printer type. Continue?" +"G-code pociety dla innej drukarki. Kontynuowac?" + +# +"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." + +# +"G-code sliced for a newer firmware. Continue?" +"G-code pociety dla nowszego firmware. Kontynuowac?" + +# +"G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." + +# +"PINDA:" +"\x00" + +# +"Preheating to cut" +"Nagrzewanie do obciecia" + +# +"Preheating to eject" +"Nagrzewanie do wysuniecia" + +# +"Printer nozzle diameter differs from the G-code. Continue?" +"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." + +# +"Rename" +"Zmien nazwe" + +# +"Select" +"Wybierz" + +# +"Sensor info" +"Info o sensorach" + +# +"Sheet" +"Plyta" + +# +"Sound [assist]" +"Dzwiek [asyst.]" + +# +"Steel sheets" +"Plyty stalowe" + +# +"Z-correct:" +"Korekcja-Z:" + +# +"Z-probe nr. [1]" +"Pomiar-Z [1]" + +# +"Z-probe nr. [3]" +"Pomiar-Z [3]" diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index d61a746f..d2e5bfd1 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: en\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:41:39\n" -"PO-Revision-Date: Ät 7. úno 2019 14:41:39\n" +"POT-Creation-Date: Wed Sep 4 16:13:32 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:32 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" msgstr "" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" msgstr "" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" msgstr "" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "" @@ -145,38 +145,28 @@ msgstr "" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "" -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "" - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "" - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" msgstr "" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" @@ -375,38 +335,13 @@ msgstr "" msgid "ERROR:" msgstr "" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "" @@ -431,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "" @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "" @@ -465,13 +400,8 @@ msgstr "" msgid "Fil. sensor [on]" msgstr "" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "" @@ -481,7 +411,7 @@ msgid "Fil. sensor [off]" msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" msgstr "" @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "" @@ -586,67 +511,62 @@ msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "" # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "" -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "" - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "" - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "" # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" msgstr "" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" msgstr "" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" msgstr "" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" msgstr "" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "" @@ -955,78 +845,73 @@ msgstr "" msgid "New firmware version available:" msgstr "" -# -#: -msgid "No " -msgstr "" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "" # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "" @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "" # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "" # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "" # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "" @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" msgstr "" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" msgstr "" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" msgstr "" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "" @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" msgstr "" -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "" - # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -1225,63 +1100,58 @@ msgstr "" msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "" - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" msgstr "" -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "" - # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "" # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" msgstr "" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "" # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" msgstr "" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" msgstr "" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "" # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" # -#: ultralcd.cpp:4885 -msgid "X-correct" +#: ultralcd.cpp:5044 +msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "" - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:4886 -msgid "Y-correct" +#: ultralcd.cpp:5045 +msgid "Y-correct:" msgstr "" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "" + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 3a1ab885..c9130c60 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:43:00\n" -"PO-Revision-Date: Ät 7. úno 2019 14:43:00\n" +"POT-Creation-Date: Wed Sep 4 16:13:39 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:39 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Zrusit" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Dostavovani Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Dostavovani Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [vyp]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Zahrivani bed" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -145,38 +145,28 @@ msgstr "Korekce podlozky" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Kalibrace Z selhala. Sensor je odpojeny nebo preruseny kabel. Cekam na reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Podlozka" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 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." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrace OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Zrusit" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta vlozena" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Barva neni cista" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" @@ -253,7 +238,7 @@ msgstr "Crash det. [zap]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Crash det. [N/A]" +msgstr "" # MSG_CRASHDETECT_OFF #: messages.c:26 @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Vypnout motory" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 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?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekce E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Korekce E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Vysunout filament" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Vysunout filament 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Vysunout filament 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Vysunout filament 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Vysunout filament 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Vysunout filament 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Vysunout" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." @@ -375,38 +335,13 @@ msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." msgid "ERROR:" msgstr "CHYBA:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Externi SPI flash W25X20CL neodpovida." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Selhani MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Selhani" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -465,13 +400,8 @@ msgstr "Kontr. vent.[vyp]" msgid "Fil. sensor [on]" msgstr "Fil. senzor [zap]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Senzor nerozpoznal filament, vypnout?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Vypadky filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Senzor filamentu" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Senzor filamentu:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Spotrebovano filamentu" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Cas tisku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Dokoncovani pohybu" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmenit extruder" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Vymena ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osy Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Zlepsuji presnost kalibracniho bodu" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Informace" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Vlozte filament do extruderu 1. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Vlozte filament do extruderu 2. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Vlozte filament do extruderu 3. Potvrdte tlacitkem." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Vlozte filament do extruderu 4. Potvrdte tlacitkem." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Je filament 1 zaveden?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iterace " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Posledni tisk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Vlevo:" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Korekce lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Cisteni barvy" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hlavni nabidka" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Pokracuji v tisku..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Merene zkoseni" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Selhani MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "MMU selhani zavadeni" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mod [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mod [tichy]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "MMU vypadky proudu" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Mod [tichy]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Mod [automaticky]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mod [vys. vykon]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 pripojeno" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Zadna SD karta" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nezapojeno " @@ -955,78 +845,73 @@ msgstr "Nezapojeno " msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" -# -#: -msgid "No " -msgstr "Ne" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Tryska" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Trysk. vent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Pozastavit tisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Nahrivani PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Prosim vlozte PLA filament do extruderu, pote stisknete tlacitko pro zavedeni filamentu." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Umistete prosim tiskovy plat na podlozku" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Prosim vlozte PLA filament do trubicky MMU, pote stisknete tlacitko pro zavedeni filamentu." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Prosim vyjmete filament a pote stisknete tlacitko." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Predehrev" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Predehrivam trysku. Prosim cekejte." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Vypadky proudu" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Predehrivam k zavedeni" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Predehrivam k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Stisknete hl. tlacitko" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Tisk pozastaven" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Postup kalibrace." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 ok." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 ok." +msgstr "Tiskovy vent." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Obnovovani tisku " # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." @@ -1225,63 +1100,58 @@ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 ok." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Vpravo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" -msgstr "SD card [normal]" +msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Vpravo" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Vyberte PLA filament:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Nastavte teplotu:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Zobrazit stav PINDA" +msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "Trideni [Zadne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Trideni: [cas]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Trideni [cas]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Tezke zkoseni" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" msgstr "Trideni [Abeceda]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Zvuk [hlasity]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Lehke zkoseni" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Zvuk [jednou]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistika " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Prohozene" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Teploty" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Vysunout" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Vyjmout vse" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Celkem selhani" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "k vyjmuti filamentu" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Vyjmout filament" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ano" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete kdykoliv znovu spustit z menu Kalibrace -> Pruvodce" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 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!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekce X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 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 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Kalibrace XYZ nepresna. Levy predni bod moc vpredu." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Zavest vse" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zavest filament 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Kalibrace XYZ selhala. Levy predni bod moc vpredu. Srovnejte tiskarnu." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zavest filament 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zavest filament 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekce Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Korekce Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zavest filament 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Zavest filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Zpet" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Kontrola" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falesne spusteni" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [Zadne]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [Prisne]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware[Varovat]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW nastaveni" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Komp. magnetu[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Komp. magnetu[Vyp]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Komp. magnetu[Zap]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh Bed Leveling" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "MMU mod [Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod [Tichy]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Model [Zadne]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Model [Prisne]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Model [Varovat]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Tryska [0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Tryska [0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Tryska [0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Tryska [Zadne]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Tryska [Prisne]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Tryska [Varovat]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Predehrivam k ustrizeni" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Predehrivam k vysunuti" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:397 +msgid "Printer 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." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Prejmenovat" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Vybrat" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Senzor info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plech" + +# +#: +msgid "Sound [assist]" +msgstr "Zvuk [asistence]" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Tiskove plechy" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Korekce Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pocet mereni Z [1]" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 77166d49..6107cef8 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:44:19\n" -"PO-Revision-Date: Ät 7. úno 2019 14:44:19\n" +"POT-Creation-Date: Wed Sep 4 16:13:46 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:46 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JCrash Erkennung kann\x1b[1;0Hnur im Modus Normal\x1b[2;0Hgenutzt werden" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JWARNUNG:\x1b[1;0HCrash Erkennung\x1b[2;0Hdeaktiviert im\x1b[3;0HStealth Modus" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Abbruch" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Z wurde eingestellt" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/V]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [aus]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Auto-Laden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -145,38 +145,28 @@ msgstr "Ausgleich Bett ok" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Z-Kalibrierung fehl- geschlagen. Sensor getrennt/Kabelbruch? Warte auf Reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Z-Kalibrierung fehl- geschlagen. Sensor zu hoch ausgeloest. Warte auf Reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Bett" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "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 druecken." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "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 druecken." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrierung OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Abbruch" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD Karte eingesetzt" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Falsche Farbe" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Motoren aus" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Der Abstand zwischen der Spitze der Duese und dem Bett ist noch nicht eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Erste Schicht Kalibrierung." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-Korrektur" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "E-Korrektur:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Filamentauswurf" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Filamentauswurf 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Fil.2 auswerfen" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Fil.3 auswerfen" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Fil.4 auswerfen" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Fil.5 auswerfen" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Auswurf" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -375,38 +335,13 @@ msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." msgid "ERROR:" msgstr "FEHLER:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Der externe SPI Flash W25X20CL antwortet nicht." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Extruder Info" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "MMU-Fehler" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Fehlerstatistik" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -465,13 +400,8 @@ msgstr "Luefter Chk.[aus]" msgid "Fil. sensor [on]" msgstr "Fil. Sensor [an]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Fil. Sensorsignal ist schlecht, ausschalten?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. Maengel" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert + richtige Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Filamentsensor" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Filamentsensor:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Druckzeit" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Bewegung beenden" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "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. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Wechsel Extruder" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Wechsel ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Pruefe Z Achse " @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Ich werde jetzt die XYZ-Kalibrierung durchfuehren. Es wird ca. 12 Minuten dauern." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Verbessere Bett Kalibrierpunkt" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Infoanzeige" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Filament in Extruder 1 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Filament in Extruder 2 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Filament in Extruder 3 einlegen. Klicken wenn fertig." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Filament in Extruder 4 einlegen. Klicken wenn fertig." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Wurde Filament 1 geladen?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Letzter Druck" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Lade Farbe" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hauptmenue" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Mesh Bett Ausgleich" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Position wiederherstellen... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Schraeglauf" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "MMU Fehler" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "MMU Ladefehler" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modus [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modus [leise]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "MMU Netzfehler" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modus [Stealth]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modus[Auto Power]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modus[Hohe Leist]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 verbunden" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Keine SD Karte" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "N.V." # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -955,78 +845,73 @@ msgstr "Nicht angeschlossen" msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" -# -#: -msgid "No " -msgstr "Nein" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt werde ich den Abstand zwischen Duesenspitze und Druckbett kalibrieren." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Duese" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Duesen Luefter" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Druck pausieren" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "PINDA erwaermen" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 Duese waehrend der Kalibrierung der ersten 4 Punkte. Wenn die Duese das Papier erfasst, den Drucker sofort ausschalten." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Legen Sie bitte PLA Filament in den Extruder und druecken Sie den Knopf, um es zu laden." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Legen Sie bitte PLA Filament in den ersten Schlauch der MMU und druecken Sie den Knopf, um es zu laden." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Bitte Filament entfernen und dann den Knopf druecken" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Vorheizen" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Netzfehler" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Heizen zum Laden" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Druckvent.:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Knopf druecken" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Druck pausiert" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrie- rungsablauf." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 bereit." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 bereit." +msgstr "Druckluefter" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Druck wiederherst " # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." @@ -1225,63 +1100,58 @@ msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 bereit." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "XYZ Kalibr. zuruecksetzen." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" -msgstr "Rechts [um]" +msgstr "Rechts [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "SD Karte [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Rechts" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " -msgstr "Selbsttest " +msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " -msgstr "Selbsttest misslung " +msgstr "Selbsttest misslang" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "PLA Filament auswaehlen:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Temp. einstellen:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Pinda-Status anzeigen" +msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "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_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sort.: [Keine]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Sort. [Keine]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sort.: [Zeit]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Sort. [Zeit]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Schwerer Schraeglauf" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sort.: [Alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Sort. [Alphabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sound [laut]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Leichter Schraeglauf" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sound [stumm]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sound [einmal]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiken " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " -msgstr "GESTOPPT. " +msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Ausgetauscht" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " -msgstr "Temp Kalib. " +msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Temp. Kal. [AN]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Temp. Kal. [AUS]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperaturen" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Entladen" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Alles entladen" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "zum Filament laden" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "zum Filament entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Filament entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekuehlt sind" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geaendert." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1641,107 +1496,317 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ja" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schraeglauf wird automatisch korrigiert." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-Korrektur" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glueckwunsch!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Vordere Kalibrierpunkte nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "XYZ-Kalibrierung beeintraechtigt. Linker vorderer Kalibrierpunkt nicht erreichbar." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Alle laden" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Filament 1 laden" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Linker vorderer Kalibrierpunkt nicht erreichbar." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Filament 2 laden" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Filament 3 laden" +"XYZ calibration failed. Right front calibration point not reachable." +#: +msgid "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." +msgstr # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-Korrektur" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Y-Korrektur:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Filament 4 laden" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Filament 5 laden" +# +#: messages.c:57 +msgid "Back" +msgstr "Zurueck" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falschtriggerung" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [ohne]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [streng]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW Einstellungen" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Magnet Komp. [nv]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Magnet Komp. [Aus]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Magnet Komp. [An]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh Bett Ausgleich" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "MMU Modus[Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod.[Stealth]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modell [ohne]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modell [streng]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modell [warn]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Duese D. [0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Duese D. [0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Duese D. [0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Duese [ohne]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Duese [streng]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Duese [warn]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Heizen zum Auswurf" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Umbenennen" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Auswahl" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Sensor Info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Blech" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Z-Korrektur:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-Probe Nr. [1]" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1a5d09a1..9262867e 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:45:41\n" -"PO-Revision-Date: Ät 7. úno 2019 14:45:41\n" +"POT-Creation-Date: Wed Sep 4 16:13:52 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:52 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] punto offset" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JDec. choque\x1b[1;0Hpuede ser activada solo en\x1b[2;0HModo normal" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Dec. choque puede\x0aser activada solo en\x0aModo normal" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATENCION:\x1b[1;0HDec. choque\x1b[2;0Hdesactivada en\x1b[3;0HModo silencio" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Cancelar" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustar Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Ajustar Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -145,38 +145,28 @@ msgstr "Corr. de la cama" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Nivelacion fallada. Sensor desconectado o cables danados. Esperando reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Nivelacion fallada. Sensor funciona demasiado pronto. Esperando reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Base calefactable " # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Estado de la correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibracion OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Cancelar" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Tarjeta insertada" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Color no homogeneo" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Apagar motores" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y 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." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-correcion" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "E-correcion:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Expulsar filamento" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Expulsar filamento 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Expulsar filamento 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Expulsar filamento 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Expulsar filamento 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Expulsar filamento 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Expulsar" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -375,38 +335,13 @@ msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexi msgid "ERROR:" msgstr "" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "No responde el flasheo externo SPI W25X20CL" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extrusor 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extrusor 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extrusor 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extrusor 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilador del extrusor:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Informacion del extrusor" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Estadistica de fallos MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Estadistica de fallos" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Velocidad Vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -465,13 +400,8 @@ msgstr "Comprob.vent[ina]" msgid "Fil. sensor [on]" msgstr "Sensor Fil. [act]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "La respuesta del sensor de fil es deficiente, ?desactivarlo?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. acabado" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensor de filamento" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Sensor de filamento:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Tiempo de imp.:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Term. movimientos" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 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." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrige el problema y pulsa el boton en la unidad MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 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?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambiar extrusor." - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Cambio correcto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Comprobando los sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Control sensor Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Mejorando punto de calibracion base" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Monitorizar" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Insertar filamento en el extrusor 1. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Insertar filamento en el extrusor 2. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Insertar filamento en el extrusor 3. Haz clic una vez terminado." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Insertar filamento en el extrusor 4. Haz clic una vez terminado." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "?Esta cargado el filamento 1?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "?Esta colocada la lamina de acero sobre la base?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Reiteracion " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ultima impresion" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Cambiando color" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Restaurando posicion..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Desviacion medida:" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Fallos MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Carga MMU falla" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silencio]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Fallo de energia en MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silencio]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modo[fuerza auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modo [rend.pleno]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 conectado" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "No hay tarjeta SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "No disponible" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "No hay conexion " @@ -955,78 +845,73 @@ msgstr "No hay conexion " msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" -# -#: -msgid "No " -msgstr "No" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 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." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Voy a precalentar la boquilla para PLA ahora." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Boquilla" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 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" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Ventilador de capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Pausar impresion" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Calentando PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserta, por favor, filamento PLA en el extrusor. Despues haz clic para cargarlo." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Por favor coloca la chapa de acero en la base calefactable." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Por favor introduce el filamento al primer tubo MMU, despues presiona el dial para imprimirlo." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Por favor quite el filamento y luego presione el dial." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Por favor retire la chapa de acero de la base calefactable." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Por favor actualice el firmware en tu MMU2. Esperando el reseteo." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Precalentar" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Cortes de energia" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Precalentar para cargar" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Precalentar para descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilador del fusor:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Pulsa el dial" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Impresion en pausa" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Impresora no esta calibrada todavia. Por favor usa el manual capitulo Primeros pasos Calibracion flujo." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Preparado para Prusa i3 MK2.5." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 prep." +msgstr "Ventilador del extrusor" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recuperando impresion" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." @@ -1225,63 +1100,58 @@ msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el n msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Preparado para i3 MK2." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Resumiendo impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Derecha [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Derecha" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 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." # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Seleccionar filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Establecer temp.:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Mostrar estado pinda" +msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordenar: [nada]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Ordenar [nada]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Orden: [Fecha]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Ordenar [Fecha]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Inclinacion severa" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordenar:[alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Ordenar [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sonido [alto]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Ligeramente inclinado" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sonido[silenciad]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sonido [una vez]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Estadisticas " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Intercambiado" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Cal. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Cal. temp. [OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibracion temperatura terminada. Haz clic para continuar." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperaturas" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filamento total:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Tiempo total :" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Descargar" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Soltar todos fil." - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Fallos totales" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "para cargar el filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "para descargar el filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Soltar filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Wizard" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La inclinacion se corregira automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-correcion" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "X-correcion:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 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 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Intr. todos fil." -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Introducir fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Calibracion XYZ fallada. Punto frontal izquierdo no alcanzable." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Introducir fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Introducir fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-correcion" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Y-correcion:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Introducir fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Cargar filamento 5" +# +#: messages.c:57 +msgid "Back" +msgstr "atras" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Comprobaciones" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falsa activacion" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware[ninguno]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware[estrict]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware [aviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Configuracion HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. imanes [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. imanes [Off]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. imanes [On]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Malla [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Malla [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Nivelacion Malla Base" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Modo MMU [Normal]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Modo MMU[Silenci]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modelo [ninguno]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modelo [estricto]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modelo [aviso]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Diam. nozzl[0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Diam. nozzl[0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Diam. nozzl[0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Nozzle [ninguno]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Nozzle [estricto]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Nozzle [aviso]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Precalentando para laminar" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Precalentar para expulsar" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro nozzle impresora difiere de cod.G. ?Continuar?" + +# +#: util.cpp:397 +msgid "Printer 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." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Renombrar" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Seleccionar" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info sensor" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Lamina" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Correccion-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-sensor nr. [1]" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index a11e2e73..dea1b4c2 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:47:01\n" -"PO-Revision-Date: Ät 7. úno 2019 14:47:01\n" +"POT-Creation-Date: Wed Sep 4 16:13:59 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:13:59 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr "de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "Offset point [0;0]" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JLa detection de crash\x1b[1;0Hpeut etre active\x1b[2;0Hqu'en mode Normal" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATTENTION :\x1b[1;0H Detection de crash\x1b[2;0H desactivee en mode\x1b[3;0H Furtif" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Annuler" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustement de Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Ajust. de Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" -msgstr "Tout est termine. Bonne impression !" +msgstr "Tout est pret. Bonne impression !" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" -msgstr "Chariots Z gauche et droite tout en haut?" +msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,39 +96,39 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoCharge du filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "AutoCharge du filament uniquement si le capteur de filament est active." +msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "AutoCharge actif, appuyez sur le bouton et inserez le filament." +msgstr "Chargement auto du filament actif, appuyez sur le btn et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Lit / Chauffage" # MSG_BED_DONE #: messages.c:16 msgid "Bed done" -msgstr "Lit termine" +msgstr "Plateau termine" # MSG_BED_HEATING #: messages.c:17 @@ -136,24 +136,14 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" -msgstr "Cor courbure du lit" +msgstr "Corr. niveau plateau" # MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 #: messages.c:18 msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -msgstr "Echec du nivellement. Capt. non declenche. Debris sur buse ? En attente d'un reset." - -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Echec du nivellement. Capteur deconnecte ou cable casse. En attente d'un reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Echec du nivellement. Capt. declenche trop trop haut. En attente d'un reset." +msgstr "Echec bed leveling. Capt. non declenche. Debris sur buse ? En attente d'un reset." # MSG_BED #: messages.c:15 @@ -161,22 +151,22 @@ msgid "Bed" msgstr "Lit" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Recup. impression ?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 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 monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibration de Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "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 monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibration terminee" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" -msgstr "Calibration" +msgstr "" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Annuler" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Carte inseree" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -241,9 +226,9 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" -msgstr "Copier la langue selectionne?" +msgstr "Copier la langue selectionne ?" # MSG_CRASHDETECT_ON #: messages.c:27 @@ -253,12 +238,12 @@ msgstr "Detect. crash[on]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Detect.crash[N/A]" +msgstr "Detect. crash [N/A]" # MSG_CRASHDETECT_OFF #: messages.c:26 msgid "Crash det. [off]" -msgstr "Detect.crash[off]" +msgstr "Detect. crash[off]" # MSG_CRASH_DETECTED c=20 r=1 #: messages.c:24 @@ -266,147 +251,97 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression ?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "Colision" +msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Date :" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Desactiver moteurs" # MSG_BABYSTEP_Z_NOT_SET c=20 r=12 #: messages.c:14 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." -msgstr "La distance entre la pointe de la buse et la surface du lit n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." +msgstr "La distance entre la pointe de la buse et la surface du plateau n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le lit chauffant ?" +msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant ?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correct-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Correct-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" -msgstr "Ejecter le fil" - -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Ejecter fil. 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Ejecter fil. 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Ejecter fil. 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Ejecter fil. 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Ejecter fil. 5" +msgstr "Ejecter le fil." # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Ejecter" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" -msgstr "Filament en cours d'ejection" +msgstr "Ejection filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERREUR : Le capteur de filament ne repond pas, verifiez la connexion." +msgstr "ERREUR : Le capteur de filament ne repond pas, verifiez le branchement." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "ERREUR :" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "La Flash SPI externe W25X20CL ne repond pas." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extrudeur 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extrudeur 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extrudeur 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extrudeur 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Infos extrudeur" @@ -416,14 +351,14 @@ msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Stat. echecs MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" -msgstr "AutoCharg F [on]" +msgstr "ChargAuto f. [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -431,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "AutoCharg F [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "AutoCharg F [off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statist. d'echec" @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Vitesse ventil" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" -msgstr "Verif venti [on]" +msgstr "Verif ventilo[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Verif venti [off]" @@ -465,15 +400,10 @@ msgstr "Verif venti [off]" msgid "Fil. sensor [on]" msgstr "Capteur Fil. [on]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "La reponse du capteur de fil. est pauvre, le desactiver ?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" -msgstr "Capteur Fil.[N/A]" +msgstr "Capteur Fil. [N/A]" # MSG_FSENSOR_OFF #: messages.c:44 @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "Manque de flm" +msgstr "Fins de filament" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur ?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Capteur de filament" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Capteur filament :" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Temps d'impression" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme ?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Mouvements de fin" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." -msgstr "D'abord, je vais lancer l'autotest pour verifier les problemes d'assemblage les plus communs." +msgstr "D'abord, je vais lancer le Selftest pour verifier les problemes d'assemblage les plus communs." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton de l'unite MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventilo impr avant ?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Chauffe desactivee par le compteur de securite." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 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 a travers le processus d'installation ?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Changer extrudeur" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Change correctement?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verification du lit" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifications butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verif. tete impr." # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verification axe Z" @@ -666,119 +586,89 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Je vais maintenant lancer la calibration xyz. Cela prendra 12 min environ." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." -msgstr "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration." - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Amelioration du point de calibration du lit" +msgstr "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ecran d'info" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Inserez le filament dans l'extrudeur 1. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Inserez le filament dans l'extrudeur 2. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Inserez le filament dans l'extrudeur 3. Cliquez une fois fait." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Inserez le filament dans l'extrudeur 4. Cliquez une fois fait." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Le filament 1 est-il charge ?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Le filament est-il charge ?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Est-ce du filament PLA ?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Le filament PLA est-il charge ?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "Feuille d'acier sur le lit chauffant ?" - -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "" +msgstr "Feuille d'acier sur plateau chauffant ?" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "Echecs d'impr. dern." +msgstr "Echecs derniere impr" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "Derniere impress." +msgstr "Derniere impression" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correction lin." # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" -msgstr "Ajuster Z en dir" +msgstr "Ajuster Z en direct" # MSG_LOAD_FILAMENT c=17 #: messages.c:51 @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Chargement couleur" @@ -796,239 +686,234 @@ msgid "Loading filament" msgstr "Chargement filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" -msgstr "Charger le fil" +msgstr "Charger dans la buse" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Mesure de la hauteur de reference du point de calibration" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" -msgstr "Nivelage du lit" +msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Reprise de la temperature ..." +msgstr "MMU OK. Remontee en temperature..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Deviation mesuree" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Echec MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Echecs charg. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" -msgstr "Mode [Normal]" +msgstr "" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mode [silencieux]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Echecs alim. MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mode [Furtif]" +msgstr "Mode [Furtif]" # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" -msgstr "Mode[puissan.aut]" +msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" -msgstr "Mode[haute puiss]" +msgstr "Mode [haute puiss]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "MMU2 connectée" +msgstr "MMU2 connecte" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Pas de carte SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connecte" # #: util.cpp:293 msgid "New firmware version available:" -msgstr "Nouvelle version de firmware disponible :" - -# -#: -msgid "No " -msgstr "Non" +msgstr "Nouvelle version de firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." -msgstr "Maintenant je vais calibrer la distance entre la pointe de la buse et le surface du lit chauffant." +msgstr "Maintenant je vais calibrer la distance entre la pointe de la buse et la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Buse" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." +msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la feuille d'acier." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "Vent buse" +msgstr "Ventilateur buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" -msgstr "Pause de l'impres" +msgstr "Pause de l'impr." # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Placez une feuille de papier sous la buse pendant la calibration des 4 premiers points. Si la buse accroche le papier, eteignez de suite l'imprimante." +msgstr "Placez une feuille de papier sous la buse pendant la calibration des 4 premiers points. Si la buse accroche le papier, eteignez vite l'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." -msgstr "Nettoyez le lit chauffant et appuyez sur le bouton." +msgstr "Nettoyez le plateau chauffant et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: messages.c:22 @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifiez :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de verifier notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." -msgstr "Inserez du filament PLA dans l'extrudeur, puis appuyez sur le bouton pour le charger." +msgstr "Inserez du filament PLA dans l'extrudeur puis appuyez sur le bouton pour le charger." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Chargez d'abord le filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." -msgstr "Ouvrez le support de poulie et retirez le filament manuellement." +msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." -msgstr "Placez la feuille d'acier sur le lit chauffant." +msgstr "Placez la feuille d'acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Veuillez inserer du filament PLA dans le premier tube du MMU, et pressez sur le bouton pour le charger." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Veuillez retirer le filament puis appuyez sur le bouton." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." -msgstr "Retirez la feuille d'acier du lit chauffant" +msgstr "Retirez la feuille d'acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Veuillez mettre a jour le firmware de votre MMU2. En attente d'un reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Veuillez retirer d'abord les protections d'envoi." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Prechauffage" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "Coupures" +msgstr "Coupures de courant" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Chauffe pour charger" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Chauffe pr decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilo impr. :" @@ -1166,57 +1051,47 @@ msgid "Print from SD" msgstr "Impr depuis la SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Impression en pause" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 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, section Processus de calibration" +msgstr "L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "Vent extru" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 prete." - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 prete." +msgstr "Ventilo impression" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recup. impression" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 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." @@ -1225,63 +1100,58 @@ msgstr "Retirez l'ancien filament puis appuyez sur le bouton pour charger le nou msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 prete." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reinit. calibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Droite [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" -msgstr "Port RPi [on]" +msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" -msgstr "Port RPi [off]" +msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Carte SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" -msgstr "Carte SD[flshAir]" +msgstr "Carte SD [flashAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Droite" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du lit" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Erreur auto-test !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "L'auto-test sera lance pour calibrer la remise a zero precise sans capteur." +msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Selectionnez le filament PLA :" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Regler temp. :" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Etat de la PINDA" +msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" msgstr "Tri : [aucun]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Tri : [heure]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Tri [heure]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Deviation severe" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Tri : [alphabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Tri [alphabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" -msgstr "Son [fort]" +msgstr "Son [fort]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Deviation legere" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" -msgstr "Son [muet]" +msgstr "Son [muet]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problemes rencontres, nivellement de l'axe Z applique..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" -msgstr "Son [une fois]" +msgstr "Son [une fois]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" -msgstr "Son [silencieux]" +msgstr "Son [silencieux]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "Une temperature ambiante stable de 21-26C et une base stable sont requis." +msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiques" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Echange" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" -msgstr "Echec calibration en temperature" +msgstr "Echec de la calibration en temperature" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." -msgstr "La calibration en temperature est terminee et active. La calibration en temperature peut etre desactivee dans le menu Reglages->Cal. Temp." +msgstr "La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" -msgstr "Temps total" +msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Decharger" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Decharger tout" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "Echecs au total" +msgstr "Total des echecs" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "pour charger le fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "pour decharger fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Decharger fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "Total" +msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" -msgstr "Attente du refroidissement de la buse et du lit" +msgstr "Attente du refroidissement des buse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Utilisez decharger pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Attention : Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Attention : Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi ?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Oui" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours poursuivre l'assistant dans Calibration-> Assistant." +msgstr "Vous pouvez toujours relancer l'assistant dans Calibration-> Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 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 !" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correction-X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations !" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibration XYZ compromise. Le point de calibration avant droite n'est pas atteignable." - -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibration XYZ compromise. Le point de calibration avant gauche n'est pas atteignable." +msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Tout charger" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Charger fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Echec calibration XYZ. Le point de calibration du lit n'a pas ete trouve." +msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant gauche n'est pas atteignable." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Charger fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant droite n'est pas atteignable." - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Charger fil. 3" +msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correction-Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Correct-Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Charger fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Charger fil. 5" +# +#: messages.c:57 +msgid "Back" +msgstr "" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "" + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index b2b78e7f..852e024a 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:48:23\n" -"PO-Revision-Date: Ät 7. úno 2019 14:48:23\n" +"POT-Creation-Date: Wed Sep 4 16:14:05 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:14:05 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,74 +21,74 @@ msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] punto offset" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JRilev. impatto\x1b[1;0Hattivabile solo\x1b[2;0Hin Modalita normale" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JATTENZIONE:\x1b[1;0HRilev. impatto\x1b[2;0Hdisattivato in\x1b[3;0HModalita silenziosa" +#: +msgid "WARNING:\x0aCrash detection disabled in Stealth mode" +msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Annulla" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Compensazione Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" +msgstr "" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Caricamento auto. filam. disp. solo con il sensore attivo..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -145,38 +145,28 @@ msgstr "Correz. liv.letto" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Livellamento piano fallito. Sensore disconnesso o Cavo Danneggiato. In attesa di reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Livellamento piano fallito. Risposta sensore troppo presto. In attesa di reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Letto" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stato delle cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "C'e stato un Blackout. Recuperare la stampa?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibrazione completa" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Annulla" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD inserita" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Colore non puro" @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Disabilita motori" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distanza tra la punta dell'ugello e la superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo layer." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 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?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correzione-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Correzione-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Espelli filamento " -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Espelli filamento 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Espellere filamento 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Espelli filamento 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Espellere filamento 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Espelli filamento 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Espellere" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Espellendo filamento " # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e stata sovrascritta" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -375,38 +335,13 @@ msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." msgid "ERROR:" msgstr "ERRORE:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Flash SPI W25X20CL esterno non risponde." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Estrusore 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Estrusore 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Estrusore 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Estrusore 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventola estrusore:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Info estrusore" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Statistiche fallimenti MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autocar.filam[on]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Statistiche fallimenti" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Velocita ventola" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Controllo ventole [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Control.vent[off]" @@ -465,13 +400,8 @@ msgstr "Control.vent[off]" msgid "Fil. sensor [on]" msgstr "Sensor filam.[On]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Risposta Sens. Fil. debole, disattivare? " - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Sensor filam[N/A]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Sensor filam[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Filam. esauriti" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensore filam." -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Sensore filam.:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Filamento utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Tempo di stampa" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Finalizzando gli spostamenti" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Calibrazione primo layer." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 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." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvi il problema e quindi premi il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambio estrusore" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Cambiato correttamente?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verifica asse Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Perfezion. punto di calibraz. letto" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Schermata info" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Inserire filamento nell'estrusore 1. Click per continuare" - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Inserire filamento nell'estrusore 2. Click per continuare" - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Inserire filamento nell'estrusore 3. Click per continuare" - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Inserire filamento nell'estrusore 4. Click per continuare" - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Il filamento 1 e caricato?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "La piastra d'acciaio e sul piano riscaldato?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iterazione" - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ultima stampa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Lato sinistro [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Correzione lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Caricando colore" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Calibrazione primo layer." # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principale" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Mesh livel. letto" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. riprendendo la posizione... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Disassamento misurato" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Fallimenti MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Caricamenti MMU falliti" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [normale]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silenzioso]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Mancanza corrente MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silenziosa]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Modo [auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [forte]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU2 connessa" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Muovi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Muovi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Muovi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Nessuna SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connesso" @@ -955,78 +845,73 @@ msgstr "Non connesso" msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" -# -#: -msgid "No " -msgstr "No" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Metti in pausa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Posizionare un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere subito la stampante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Per favore prima carica il filamento di PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 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=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Per favore inserite del filamento PLA nel primo tubo del MMU, poi premete la manopola per caricarlo." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Rimuovi il filamento e quindi premi la manopola. " # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Preriscalda" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Mancanza corrente" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Preriscaldamento per caricare" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Preriscaldamento per scaricare" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventola di stampa:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Premere la manopola" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Stampa in pausa" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." @@ -1186,37 +1071,27 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 pronta." +msgstr "Ventola di stampa" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Recupero stampa" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 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. " @@ -1225,63 +1100,58 @@ msgstr "Rimuovi il filamento precedente e premi la manopola per caricare il nuov msgid "Prusa i3 MK3S OK." msgstr "" -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 pronta." - # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Destra [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Mem. SD [normale]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Destra" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Selezionate filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Imposta temperatura:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Mostra stato pinda" +msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordina: [none]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Ordina [none]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Ordina: [time]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Ordina [time]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Disassamento grave" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordine: [alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Ordine [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Suono [forte]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Disassamento lieve" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Suono [mute]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Suono [singolo]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiche" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Scambiato" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Calib. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Calib. temp.[OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperature" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Tempo di stampa totale" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Scarica" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rilasciare tutti" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Totale fallimenti" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "per caricare il filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Scarica filam." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correzione-X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 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 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Caricare tutti" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Caricare fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Calibrazione XYZ fallita. Punto anteriore sinistro non raggiungibile." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Caricare fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Carica fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correzione-Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Correzione-Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Caricare fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Caricare fil. 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Indietro" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Controlli" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falso innesco" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware[nessuno]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [esatto]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware [avviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Installazione HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. Magneti[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. Magneti[off]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. Magneti [on]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Griglia [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Griglia [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Mesh livel. letto" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Modalita MMU [Normale]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Modalita MMU [Silenziosa]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Cambio modalita in corso ..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Modello [nessuno]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Modello [esatto]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Modello [avviso]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Diam. Ugell[0.25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Diam. Ugell[0.40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Diam. Ugell[0.60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Ugello [nessuno]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Ugello [esatto]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Ugello [avviso]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Preriscaldamento per taglio" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Preriscaldamento per espulsione" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro ugello diverso da G-Code. Continuare?" + +# +#: util.cpp:397 +msgid "Printer 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." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Rinomina" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Seleziona" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info Sensore" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Piano" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Correzione-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-probe nr. [1]" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 540adfbf..d5a67949 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Ät 7. úno 2019 14:49:46\n" -"PO-Revision-Date: Ät 7. úno 2019 14:49:46\n" +"POT-Creation-Date: Wed Sep 4 16:14:12 CEST 2019\n" +"PO-Revision-Date: Wed Sep 4 16:14:12 CEST 2019\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,72 +21,72 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3027 msgid "[0;0] point offset" msgstr "[0;0] przesuniecie punktu" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -msgstr "\x1b[2JWykrywanie zderzen moze\x1b[1;0Hbyc wlaczone tylko w\x1b[2;0Htrybie Normalnym" +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ultralcd.cpp:4231 -msgid "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -msgstr "\x1b[2JUWAGA:\x1b[1;0HWykrywanie zderzen\x1b[2;0Hwylaczone w\x1b[3;0Htrybie Stealth" +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2290 msgid ">Cancel" -msgstr "" +msgstr ">Anuluj" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Dostrajanie Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3147 +msgid "Adjusting Z:" +msgstr "Dostrajanie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1974 msgid "Ambient" -msgstr "" +msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2576 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3445 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi dojechaly do gornych ogranicznikow?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5114 msgid "SpoolJoin [on]" msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5110 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [nd]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#: ultralcd.cpp:5118 msgid "SpoolJoin [off]" msgstr "SpoolJoin [wyl]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6736 msgid "AutoLoad filament" msgstr "AutoLadowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4378 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2771 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5682 msgid "Bed level correct" msgstr "Korekta poziomowania stolu" @@ -145,38 +145,28 @@ msgstr "Korekta poziomowania stolu" msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." msgstr "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." -# MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -#: Marlin_main.cpp:4508 -msgid "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -msgstr "Poziomowanie stolu nieudane. Sensor odlacz. lub uszkodz. przewod. Czekam na reset." - -# MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -#: Marlin_main.cpp:4512 -msgid "Bed leveling failed. Sensor triggered too high. Waiting for reset." -msgstr "Kalibracja Z nieudana. Sensor aktywowal za wysoko. Czekam na reset." - # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Stol" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2002 msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" -msgstr "" +msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5671 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -186,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4570 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "Calibrating XYZ. 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." @@ -201,37 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3408 msgid "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_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibracja OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Cancel" msgstr "Anuluj" -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta wlozona" - # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2676 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -241,7 +226,7 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4503 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" @@ -266,27 +251,27 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Crash" -msgstr "" +msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5823 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2102 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5568 msgid "Disable steppers" msgstr "Wylaczenie silnikow" @@ -296,77 +281,52 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4984 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?" -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekcja E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5048 +msgid "E-correct:" +msgstr "Korekcja E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Wysun filament" -# MSG_EJECT_FILAMENT1 c=17 r=1 -#: ultralcd.cpp:5603 -msgid "Eject filament 1" -msgstr "Wysun filament 1" - -# MSG_EJECT_FILAMENT2 c=17 r=1 -#: ultralcd.cpp:5604 -msgid "Eject filament 2" -msgstr "Wysun filament 2" - -# MSG_EJECT_FILAMENT3 c=17 r=1 -#: ultralcd.cpp:5605 -msgid "Eject filament 3" -msgstr "Wysun filament 3" - -# MSG_EJECT_FILAMENT4 c=17 r=1 -#: ultralcd.cpp:5606 -msgid "Eject filament 4" -msgstr "Wysun filament 4" - -# MSG_EJECT_FILAMENT5 c=17 r=1 -#: ultralcd.cpp:5607 -msgid "Eject filament 5" -msgstr "Wysun filament 5" - # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Eject" msgstr "Wysun" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4391 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -375,38 +335,13 @@ msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." msgid "ERROR:" msgstr "BLAD:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Zewnetrzna pamiec flash SPI W25X20CL nie odpowiada." - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Ekstruder 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Ekstruder 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Ekstruder 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Ekstruder 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Went. ekstrudera:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2133 msgid "Extruder info" msgstr "Informacje o ekstruderze" @@ -416,12 +351,12 @@ msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" -msgstr "" +msgstr "Bledy MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5082 msgid "F. autoload [on]" msgstr "Autolad. fil [wl]" @@ -431,14 +366,14 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5084 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" -msgstr "" +msgstr "Statystyki bledow" # MSG_FAN_SPEED c=14 #: messages.c:31 @@ -446,17 +381,17 @@ msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5577 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5579 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -465,13 +400,8 @@ msgstr "Sprawd.went.[wyl]" msgid "Fil. sensor [on]" msgstr "Czuj. filam. [wl]" -# MSG_RESPONSE_POOR c=20 r=2 -#: Marlin_main.cpp:3146 -msgid "Fil. sensor response is poor, disable it?" -msgstr "Reakcja czujnika slaba, wylaczyc?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5062 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -481,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Filam. runouts" -msgstr "" +msgstr "Konc. filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -491,32 +421,27 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy a kolor jest czysty?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2672 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Czujnik filamentu" -# MSG_SELFTEST_FILAMENT_SENSOR c=18 -#: ultralcd.cpp:7477 -msgid "Filament sensor:" -msgstr "Czujnik filamentu:" - # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2841 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2841 msgid "Print time" msgstr "Czas druku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -526,52 +451,52 @@ msgid "Finishing movements" msgstr "Konczenie druku" # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4896 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2095 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3220 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8468 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -586,67 +511,62 @@ msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4875 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2096 msgid "howto.prusa3d.com" msgstr "" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmiana ekstrudera" - # MSG_FILAMENTCHANGE #: messages.c:37 msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2587 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2664 msgid "Changed correctly?" msgstr "Wymiana ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Sprawdzanie czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osi Z" @@ -666,112 +586,82 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4905 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4913 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4978 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: mesh_bed_calibration.cpp:2481 -msgid "Improving bed calibration point" -msgstr "Poprawiam precyzje punktu kalibracyjnego" - # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ekran informacyjny" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Wloz filament do ekstrudera 1. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Wloz filament do ekstrudera 2. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Wloz filament do ekstrudera 3. Potwierdz naciskajac pokretlo." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Wloz filament do ekstrudera 4. Potwierdz naciskajac pokretlo." - # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4938 msgid "Is filament 1 loaded?" msgstr "Filament 1 zaladowany?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2572 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4941 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4972 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4704 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iteracja " - # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1840 msgid "Last print failures" -msgstr "" +msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1823 msgid "Last print" -msgstr "" +msgstr "Ost. wydruk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2970 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3218 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5594 msgid "Lin. correction" msgstr "Korekcja lin." @@ -786,7 +676,7 @@ msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2612 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -796,92 +686,92 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6719 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu glowne" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5677 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Wznawianie pozycji." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3005 msgid "Measured skew" msgstr "Zmierzony skos" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU fails" -msgstr "" +msgstr "Bledy MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1613 msgid "MMU load failed " -msgstr "" +msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1840 msgid "MMU load fails" -msgstr "" +msgstr "Bledy ladow. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Tryb [normalny]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Tryb [cichy]" # -#: mmu.cpp:635 +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "MMU power fails" -msgstr "" +msgstr "Zaniki zasil. MMU" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Tryb [Stealth]" @@ -891,62 +781,62 @@ msgid "Mode [auto power]" msgstr "Tryb [automatycz]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Tryb[wysoka wyd.]" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2108 msgid "MMU2 connected" -msgstr "" +msgstr "MMU podlaczone" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5566 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4294 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4295 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4296 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5291 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6686 msgid "No SD card" msgstr "Brak karty SD" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2976 msgid "N/A" -msgstr "" +msgstr "N/D" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nie podlaczono " @@ -955,78 +845,73 @@ msgstr "Nie podlaczono " msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" -# -#: -msgid "No " -msgstr "Nie" - # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4977 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4921 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Dysza" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1519 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4912 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:1782 msgid "Nozzle FAN" -msgstr "" +msgstr "Went. hotendu" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6649 msgid "Pause print" msgstr "Wstrzymanie wydruku" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1598 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1604 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5683 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Umiesc kartke papieru na stole roboczym i podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4986 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -1036,92 +921,92 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4808 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Umiesc filament PLA w ekstruderze i nacisnij pokretlo, aby zaladowac." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4709 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3063 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4803 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Wsun filament PLA do pierwszej rurki MMU i nacisnij pokretlo aby go zaladowac." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Wyciagnij filament i wcisnij pokretlo." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4354 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosze zaktualizowac Firmware MMU2. Czekam na reset." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4911 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6636 msgid "Preheat" msgstr "Grzanie" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." @@ -1131,32 +1016,32 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10365 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1876 msgid "Power failures" -msgstr "" +msgstr "Zaniki zasilania" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2276 msgid "Preheating to load" -msgstr "" +msgstr "Nagrzew. do ladowania" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2280 msgid "Preheating to unload" -msgstr "" +msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Went. wydruku:" @@ -1166,17 +1051,17 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2206 msgid "Press the knob" -msgstr "" +msgstr "Wcisnij pokretlo" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1061 msgid "Print paused" msgstr "Druk wstrzymany" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." @@ -1186,102 +1071,87 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1784 msgid "Print FAN" -msgstr "" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK2.5 ready." -msgstr "Prusa i3 MK2.5 gotowa" - -# WELCOME_MSG c=20 -#: -msgid "Prusa i3 MK3 ready." -msgstr "Prusa i3 MK3 gotowa" +msgstr "Went. wydruku" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2094 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3221 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9765 msgid "Recovering print " msgstr "Wznawianie wydruku" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." # #: msgid "Prusa i3 MK3S OK." -msgstr "" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 gotowa" +msgstr "Prusa i3 MK3S OK" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5688 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3222 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6656 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3219 msgid "Right side[um]" msgstr "Prawo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5606 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5604 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4726 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5236 msgid "SD card [normal]" msgstr "Karta SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5234 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2971 msgid "Right" msgstr "Prawa" @@ -1291,217 +1161,207 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5613 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Rozpoczynanie Selftestu" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5664 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Blad selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1551 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4959 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4695 msgid "Select PLA filament:" msgstr "Wybierz filament PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3230 msgid "Set temperature:" msgstr "Ustaw. temperatury:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5685 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3941 msgid "Sensor state" -msgstr "" - -# -#: -msgid "Sensors info" -msgstr "" - -# -#: -msgid "Show pinda state" -msgstr "Stan sondy PINDA" +msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 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." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sortuj: [brak]" +#: ultralcd.cpp:5246 +msgid "Sort [none]" +msgstr "Sortuj [brak]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sortuj: [czas]" +#: ultralcd.cpp:5244 +msgid "Sort [time]" +msgstr "Sortuj [czas]" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3008 msgid "Severe skew" msgstr "Znaczny skos" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sortuj: [alfabet]" +#: ultralcd.cpp:5245 +msgid "Sort [alphabet]" +msgstr "Sortuj [alfabet]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Dzwiek [Glosny]" # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3007 msgid "Slight skew" msgstr "Lekki skos" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Dzwiek[Wylaczony]" # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4870 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z ..." # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Dzwiek [1-raz]" # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Dzwiek [Cichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4367 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statystyki" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zatrzymac druk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Zamieniono" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5600 msgid "Temp. cal. [on]" msgstr "Kalibr. temp.[wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5598 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5694 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3867 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5564 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2140 msgid "Temperatures" msgstr "Temperatury" @@ -1511,127 +1371,122 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2863 msgid "Total filament" msgstr "Calkowita dlugosc filamentu" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2863 msgid "Total print time" msgstr "Calkowity czas druku" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6633 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4783 msgid "Unload" msgstr "Rozladuj" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rozladuj wszystkie" - -# -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1857 msgid "Total failures" -msgstr "" +msgstr "Suma bledow" # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2213 msgid "to load filament" -msgstr "" +msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2217 msgid "to unload filament" -msgstr "" +msgstr "aby rozlad. filament" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Rozladowanie fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1824 msgid "Total" -msgstr "" +msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5822 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2143 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2116 msgid "unknown" -msgstr "" +msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5262 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3374 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3338 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4782 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku." # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1511 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3053 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5661 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2132 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1641,107 +1496,312 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Tak" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3838 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" # -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekcja X" +#: ultralcd.cpp:5044 +msgid "X-correct:" +msgstr "Korekcja X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3832 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3816 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 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3819 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -#: ultralcd.cpp:3699 -msgid "XYZ calibration compromised. Left front calibration point not reachable." -msgstr "Kalibracja XYZ niedokladna. Lewy przedni punkt nieosiagalny." - # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6080 msgid "Load all" msgstr "Zalad. wszystkie" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zaladuj fil. 1" - # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3798 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Kalibr. XYZ nieudana. Lewy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zaladuj fil. 2" - -# -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3807 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zaladuj fil. 3" - # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2968 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekcja Y" +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Korekcja Y:" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zaladuj fil. 4" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Laduj filament 5" +# +#: messages.c:57 +msgid "Back" +msgstr "Wstecz" + +# +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "Testy" + +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falszywy alarm" + +# +#: ultralcd.cpp:3946 +msgid "FINDA:" +msgstr "" + +# +#: ultralcd.cpp:5459 +msgid "Firmware [none]" +msgstr "Firmware [brak]" + +# +#: ultralcd.cpp:5465 +msgid "Firmware [strict]" +msgstr "Firmware [restr.]" + +# +#: ultralcd.cpp:5462 +msgid "Firmware [warn]" +msgstr "Firmware[ostrzez]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Ustawienia HW" + +# +#: ultralcd.cpp:3950 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Kor. magnesow [nd]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Kor. magnesow[wyl]" + +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Kor. magnesow [wl]" + +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Siatka [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Siatka [7x7]" + +# +#: ultralcd.cpp:5591 +msgid "Mesh bed leveling" +msgstr "Poziomowanie wg siatki" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +# +#: ultralcd.cpp:5220 +msgid "MMU Mode [Normal]" +msgstr "Tryb MMU[Normaln]" + +# +#: ultralcd.cpp:5221 +msgid "MMU Mode[Stealth]" +msgstr "Tryb MMU [Stealth]" + +# +#: ultralcd.cpp:4427 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + +# +#: ultralcd.cpp:5420 +msgid "Model [none]" +msgstr "Model [brak]" + +# +#: ultralcd.cpp:5426 +msgid "Model [strict]" +msgstr "Model [restrykc.]" + +# +#: ultralcd.cpp:5423 +msgid "Model [warn]" +msgstr "Model [ostrzez.]" + +# +#: ultralcd.cpp:5381 +msgid "Nozzle d. [0.25]" +msgstr "Sr. dyszy [0,25]" + +# +#: ultralcd.cpp:5384 +msgid "Nozzle d. [0.40]" +msgstr "Sr. dyszy [0,40]" + +# +#: ultralcd.cpp:5387 +msgid "Nozzle d. [0.60]" +msgstr "Sr. dyszy [0,60]" + +# +#: ultralcd.cpp:5335 +msgid "Nozzle [none]" +msgstr "Dysza [brak]" + +# +#: ultralcd.cpp:5341 +msgid "Nozzle [strict]" +msgstr "Dysza [restrykc.]" + +# +#: ultralcd.cpp:5338 +msgid "Nozzle [warn]" +msgstr "Dysza [ostrzez.]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "" + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "" + +# +#: ultralcd.cpp:3942 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2286 +msgid "Preheating to cut" +msgstr "Nagrzewanie do obciecia" + +# +#: ultralcd.cpp:2283 +msgid "Preheating to eject" +msgstr "Nagrzewanie do wysuniecia" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +#: util.cpp:397 +msgid "Printer 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." + +# +#: ultralcd.cpp:6597 +msgid "Rename" +msgstr "Zmien nazwe" + +# +#: ultralcd.cpp:6593 +msgid "Select" +msgstr "Wybierz" + +# +#: ultralcd.cpp:2134 +msgid "Sensor info" +msgstr "Info o sensorach" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plyta" + +# +#: +msgid "Sound [assist]" +msgstr "" + +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "" + +# +#: ultralcd.cpp:5046 +msgid "Z-correct:" +msgstr "Korekcja-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pomiar-Z [1]" diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index 8547b265..79a932ba 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -15,7 +15,12 @@ msgstr "\e[2JCrash detekce muze\e[1;0Hbyt zapnuta pouze v\e[2;0HNormal modu" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #: ultralcd.cpp:4231 msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" -msgstr "\e[2JPOZOR:\e[1;0HCrash detekce\e[2;0Hdeaktivovana ve\e[3;0HStealth modu" +msgstr "\e[2JPOZOR:\e[1;0HCrash detekce\e[2;0Hdeaktivovana ve\e[3;0Htichem modu" + +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr "1" # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 @@ -48,10 +53,15 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[vyp]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,14 +78,19 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=20 #: ultralcd.cpp:3043 msgid "Adjusting Z" -msgstr "Dostavovani Z" +msgstr "Doladeni Z" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Doladeni Z:" # MSG_ALL c=19 r=1 #: messages.c:11 @@ -83,27 +98,27 @@ msgid "All" msgstr "Vse" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Auto home" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Delka osy" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Zpet" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Podlozka" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Zahrivani bed" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Pocatek seznamu souboru" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Zkalibrovat" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibrovat E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 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." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrace" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibrace OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Zrusit" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Karta vlozena" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta vyjmuta" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Vymenit SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Vymena ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Vymena filamentu!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osy Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Kontrola" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Vyber filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Barva neni cista" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Kopirovat vybrany jazyk do XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Naraz" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Crash detekce muze byt zapnuta pouze v Normal modu" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Vypnout motory" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 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?" @@ -462,13 +492,18 @@ msgstr "E kalibrace ukoncena. Prosim ocistete trysku. Pote potvrdte tlacitkem." msgid "E-correct" msgstr "Korekce E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Korekce E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Vysunout" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Vysunout filament" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Vysunout filament 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Vysouvam filament" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Konec sezn. souboru" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Konc. spinace" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "zarazovani \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "CHYBA:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Extruder info" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Selhani" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Selhani MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falesne spusteni" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Senzor nerozpoznal filament, vypnout?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -663,9 +703,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" -msgstr "Vypadky filamentu" +msgstr "Vypadky filam." # MSG_FILAMENT c=17 r=1 #: messages.c:30 @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Senzor filamentu:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Spotrebovano filamentu" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filament : " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -717,53 +757,93 @@ msgstr "Soubor otevren:" msgid "File selected" msgstr "Soubor vybran" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Dokoncovani pohybu" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [Zadne]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [Varovat]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [Prisne]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Predni/levy vent." +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" + +# +#: util.cpp:433 +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." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code je pripraven pro novejsi firmware. Pokracovat?" + +# +#: util.cpp:483 +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." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" @@ -773,7 +853,7 @@ msgid "Heating" msgstr "Zahrivani" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -783,27 +863,32 @@ msgid "Heating done." msgstr "Zahrivani OK." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW nastaveni" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." @@ -813,7 +898,7 @@ msgid "Improving bed calibration point" msgstr "Zlepsuji presnost kalibracniho bodu" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Informace" @@ -823,7 +908,7 @@ msgid "Init. SD card" msgstr "Inic. SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Vlozte filament" @@ -848,27 +933,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Vlozte filament do extruderu 4. Potvrdte tlacitkem." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Je filament 1 zaveden?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" @@ -883,27 +973,27 @@ msgid "KILLED. " msgstr "ZRUSENO." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Posledni tisk" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Vlevo:" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Vlevo [um]" @@ -913,7 +1003,7 @@ msgid "Left:" msgstr "Vlevo:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Korekce lin." @@ -923,7 +1013,7 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Zavest vse" @@ -958,12 +1048,12 @@ msgid "Load filament 5" msgstr "Zavest filament 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Cisteni barvy" @@ -973,7 +1063,7 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Uvolnena remenicka" @@ -993,7 +1083,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Neplatny extruder " # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" @@ -1012,8 +1102,23 @@ msgstr "M218 Neplatny extruder " msgid "M221 Invalid extruder " msgstr "M221 Neplatny extruder " +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Komp. magnetu[Zap]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Komp. magnetu[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Komp. magnetu[Vyp]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hlavni nabidka" @@ -1023,42 +1128,77 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Oznacte filament 100 mm od tela extruderu a pote potvrdte tlacitkem." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Merene zkoseni" # MSG_MEASURED_SKEW c=15 r=1 #: ultralcd.cpp:2335 msgid "Measured skew:" -msgstr "Merene zkoseni:" +msgstr "Merene zkos.:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh Bed Leveling" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmware detekovan na tiskarne MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detekovan na tiskarne MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Selhani MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "MMU selhani zavadeni" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "MMU mod [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod [Tichy]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." @@ -1068,44 +1208,49 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU potrebuje zasah uzivatele. Opravte chybu a pote stisknete tlacitko na jednotce MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Pokracuji v tisku..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "MMU vypadky proudu" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 pripojeno" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mod [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mod [tichy]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mod [tichy]" +msgstr "Mod [Tichy]" + +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." # MSG_AUTO_MODE_ON #: messages.c:12 @@ -1113,37 +1258,52 @@ msgid "Mode [auto power]" msgstr "Mod [automaticky]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mod [vys. vykon]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Trideni [Zadne]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Model [Varovat]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Model [Prisne]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Posunout Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1313,7 @@ msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Ne" @@ -1168,12 +1328,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Zadny kontrolni soucet s cislem radku, Posl. radek:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Zadna SD karta" @@ -1183,37 +1343,67 @@ msgid "No thermistors - no temperature" msgstr "Bez termistoru - bez odectu teploty" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nezapojeno " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Tryska" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Tryska [Zadne]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Tryska [Varovat]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Tryska [Prisne]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Tryska [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Tryska [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Tryska [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Trysk. vent." @@ -1238,7 +1428,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." @@ -1258,7 +1448,7 @@ msgid "openRoot failed" msgstr "openRoot selhal" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pozastavit tisk" @@ -1268,42 +1458,47 @@ msgid "Pick print" msgstr "Vyberte vytisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Nahrivani PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -1313,12 +1508,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Prosim vlozte PLA filament do extruderu, pote stisknete tlacitko pro zavedeni filamentu." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Prosim vlozte PLA filament do trubicky MMU, pote stisknete tlacitko pro zavedeni filamentu." @@ -1328,52 +1523,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Prosim zavedte PLA filament a po te obnovte Pruvodce stisknutim reset tlacitka." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Umistete prosim tiskovy plat na podlozku" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Prosim vyjmete filament a pote stisknete tlacitko." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." @@ -1383,12 +1578,12 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Vypadky proudu" @@ -1398,29 +1593,39 @@ msgid "PowerUp" msgstr "Zapnuti" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Predehrev" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." -msgstr "Predehrivam trysku. Prosim cekejte." +msgstr "Predehrev trysky. Prosim cekejte." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Predehrev k ustrizeni" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Predehrev k vysunuti" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" -msgstr "Predehrivam k zavedeni" +msgstr "Predehrev k zavedeni" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" -msgstr "Predehrivam k vyjmuti" +msgstr "Predehrev k vyjmuti" # MSG_PREPARE_FILAMENT c=20 r=1 #: ultralcd.cpp:1911 @@ -1428,27 +1633,27 @@ msgid "Prepare new filament" msgstr "Pripravte filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Tiskovy vent." @@ -1458,7 +1663,7 @@ msgid "Print FAN: " msgstr "Tisk. vent:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1468,12 +1673,12 @@ msgid "Print from SD" msgstr "Tisk z SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Tisk pozastaven" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Cas tisku" @@ -1487,6 +1692,16 @@ msgstr "Cas tisku: " msgid "Printer disconnected" msgstr "Tiskarna odpojena" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Firmware tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Firmware tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1712,26 @@ msgstr "Tiskarna zastavena. Volano kill()!" 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." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Model tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Model tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:397 +msgid "Printer 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." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1747,11 @@ msgstr "Prusa i3 MK2 ok." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 ok." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1763,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Obnovovani tisku " @@ -1543,10 +1783,15 @@ msgid "Refresh" msgstr "Obnovit" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Prejmenovat" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1808,32 @@ msgid "Resend: " msgstr "Poslat znovu: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Obnoveni tisku" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Vpravo" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Vpravo [um]" @@ -1603,22 +1848,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Otacejte tlacitkem dokud znacka nedosahne tela extruderu. Potvrdte tlacitkem." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "SD card [normal]" @@ -1633,7 +1878,7 @@ msgid "SD card [FlshAir]" msgstr "SD card [FlshAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" @@ -1652,53 +1897,63 @@ msgstr "SD printing byte " msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Vybrat" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Vyber jazyka" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Vyberte PLA filament:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Self test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Senzor info" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stav senzoru" @@ -1708,17 +1963,17 @@ msgid "Sensors info" msgstr "Senzor info" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Nastavte teplotu:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Nastaveni" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Tezke zkoseni" @@ -1727,8 +1982,13 @@ msgstr "Tezke zkoseni" msgid "Severe skew:" msgstr "Tezke zkoseni:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plech" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Stav konc. spin." @@ -1743,7 +2003,7 @@ msgid "Sleep..." msgstr "Spankovy rezim..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Lehke zkoseni" @@ -1753,15 +2013,30 @@ msgid "Slight skew:" msgstr "Lehke zkoseni:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Trideni [Zadne]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Trideni [cas]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Trideni [Abeceda]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2078,127 @@ msgid "Sort: [time]" msgstr "Trideni [Cas]\n" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Zvuk [hlasity]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Zvuk [jednou]" +# +#: +msgid "Sound [assist]" +msgstr "Zvuk [Asist.]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Toci se" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [vyp]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistika " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Tiskove platy" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Krokovani prilis vysoko:" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Prohozene" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Teplota" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" @@ -1923,12 +2208,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Tiskarna nebyla teplotne zkalibrovana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Teploty" @@ -1938,27 +2223,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "k vyjmuti filamentu" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Celkem" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filament celkem" @@ -1968,7 +2253,7 @@ msgid "Total filament :" msgstr "Filament celkem :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Celkovy cas tisku" @@ -1983,17 +2268,17 @@ msgid "TRIGGERED" msgstr "AKTIVNI" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "neznamy" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Vysunout" @@ -2003,7 +2288,7 @@ msgid "Unload all" msgstr "Vyjmout vse" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Vyjmout filament" @@ -2028,22 +2313,22 @@ msgid "Unload filament 4" msgstr "Vyjmout filam. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Napeti" @@ -2053,32 +2338,37 @@ msgid "volume.init failed" msgstr "volume.init selhalo" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "VAROVANI: Crash detekce je zakazana v Tichem rezimu" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." @@ -2088,17 +2378,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "VAROVANI: Neznama, nepodporovana verze firmware. Pouziti na vlastni nebezpeci!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Pruvodce" @@ -2117,23 +2407,28 @@ msgstr "Zapis do souboru:" msgid "X-correct" msgstr "Korekce X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Korekce X" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 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 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." @@ -2143,17 +2438,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Levy predni bod moc vpredu." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." @@ -2168,17 +2463,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 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 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Y vzdalenost od min" @@ -2192,8 +2487,13 @@ msgstr "Y vzdalenost od min:" msgid "Y-correct" msgstr "Korekce Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Korekce Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ano" @@ -2208,11 +2508,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Pouzivate beta verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete kdykoliv znovu spustit z menu Kalibrace -> Pruvodce" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Korekce Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pocet mereni Z [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Pocet mereni Z [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" diff --git a/lang/po/new/de.po b/lang/po/new/de.po index c5288b83..110aea5e 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -17,6 +17,11 @@ msgstr "\e[2JCrash Erkennung kann\e[1;0Hnur im Modus Normal\e[2;0Hgenutzt werden msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JWARNUNG:\e[1;0HCrash Erkennung\e[2;0Hdeaktiviert im\e[3;0HStealth Modus" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " von 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[aus]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Abbruch" @@ -77,33 +87,38 @@ msgstr ">Abbruch" msgid "Adjusting Z" msgstr "Z wurde eingestellt" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Z Anpassen:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Alle" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Auto-Laden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Achsenlaenge" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Zurueck" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Bett" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Beginn Dateiliste" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Kalibrieren" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibrierung E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "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 druecken." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "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 druecken." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibrierung" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibrierung OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Abbruch" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "SD Karte eingesetzt" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD Karte entfernt" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Wechsel SD Karte" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Wechsel ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Filament-Wechsel!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Pruefe Z Achse " +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Checks" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Waehle Filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Falsche Farbe" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Gewaehlte Sprache vom Xflash kopieren?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Crash" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Crash-Erkennung\nkann nur im Normal\nModus erfolgen" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Motoren aus" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Der Abstand zwischen der Spitze der Duese und dem Bett ist noch nicht eingestellt. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Erste Schicht Kalibrierung." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?" @@ -462,13 +492,18 @@ msgstr "E-Kalibrierung beendet. Bitte reinigen Sie die Duese. Klicken wenn ferti msgid "E-correct" msgstr "E-Korrektur" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "E-Korrektur:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Auswurf" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Filamentauswurf" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Fil.5 auswerfen" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "werfe Filament aus" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Ende Dateiliste" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endschalter" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "In Warteschlange \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "FEHLER:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Extruder Info" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Fehlerstatistik" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "MMU-Fehler" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falschtriggerung" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Fil. Sensorsignal ist schlecht, ausschalten?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. Maengel" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert + richtige Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Filamentsensor" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Filamentsensor:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filament benutzt" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamentverbrauch: " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -717,53 +757,103 @@ msgstr "Datei geoeffnet: " msgid "File selected" msgstr "Datei ausgewaehlt" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Bewegung beenden" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [ohne]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [warn]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [streng]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" + +# +#: util.cpp:516 +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." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" + +# +#: util.cpp:433 +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." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" + +# +#: util.cpp:483 +msgid "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." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Aufwaermen OK." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "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. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW Einstellungen" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Ich werde jetzt die XYZ-Kalibrierung durchfuehren. Es wird ca. 12 Minuten dauern." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Verbessere Bett Kalibrierpunkt" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Infoanzeige" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Init. SD Karte" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Filament einlegen" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Filament in Extruder 4 einlegen. Klicken wenn fertig." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Wurde Filament 1 geladen?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "ABGEBROCHEN. " # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Letzter Druck" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Links" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Linker Luefter?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Links [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Links:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Z einstellen" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Alle laden" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Filament 5 laden" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Lade Farbe" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Lose Riemenscheibe" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Falscher Extruder " # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." @@ -1012,8 +1112,23 @@ msgstr "M218 Falscher Extruder " msgid "M221 Invalid extruder " msgstr "M221 Falscher Extruder " +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Magnet Komp. [An]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Magnet Komp. [nv]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Magnet Komp.[Aus]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Hauptmenue" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Filament 100mm vom Extrudergehaeuse markieren. Klicken wenn Fertig." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Schraeglauf" @@ -1033,117 +1148,172 @@ msgid "Measured skew:" msgstr "Schraeglauf:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bett Ausgleich" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh Bett Ausgleich" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-Firmware auf MK3S-Drucker erkannt" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "MMU Fehler" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "MMU Ladefehler" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "MMU Modus[Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "MMU Modus[Stealth]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # MSG_MMU_NEEDS_ATTENTION c=20 r=4 #: mmu.cpp:359 msgid "MMU needs user attention. Fix the issue and then press button on MMU unit." -msgstr "MMU hat eine Störung. Beseitigen Sie das Problem und drücken Sie den Knopf an der MMU." +msgstr "MMU hat eine Stoerung. Beseitigen Sie das Problem und druecken Sie den Knopf an der MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Position wiederherstellen... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "MMU Netzfehler" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 verbunden" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modus [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modus [leise]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modus [Stealth]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modus[Auto Power]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modus[Hohe Leist]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modell [ohne]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modell [warn]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modell [streng]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Bewege Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N.V." @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nein" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Keine Pruefsumme mit Zeilennummer, Letzte Zeile: " # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Keine SD Karte" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Keine Thermistoren - keine Temperatur" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nicht angeschlossen" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt werde ich den Abstand zwischen Duesenspitze und Druckbett kalibrieren." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Duese" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Duese [ohne]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Duese [warn]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Duese [streng]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Duese D. [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Duese D. [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Duese D. [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Duesen Luefter" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "Zugriff auf Hauptverzeichnis misslungen" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Druck pausieren" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Druck auswaehlen" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "PINDA erwaermen" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 Duese waehrend der Kalibrierung der ersten 4 Punkte. Wenn die Duese das Papier erfasst, den Drucker sofort ausschalten." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -1313,12 +1518,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Legen Sie bitte PLA Filament in den Extruder und druecken Sie den Knopf, um es zu laden." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Legen Sie bitte PLA Filament in den ersten Schlauch der MMU und druecken Sie den Knopf, um es zu laden." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Bitte PLA-Filament\nladen und Assistent\nfortsetzen, indem\nSie den Drucker neu\nstarten." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Bitte Filament entfernen und dann den Knopf druecken" # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Netzfehler" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Einschalten" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Vorheizen" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Heizen zum Auswurf" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Heizen zum Laden" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Heizen zum Entladen" @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Filam. bereithalten" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Knopf druecken" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Druckluefter" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Druckvent.: " # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Druckvent.:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Drucken von SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Druck pausiert" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Druckzeit" @@ -1487,6 +1702,26 @@ msgstr "Druckzeit: " msgid "Printer disconnected" msgstr "Drucker getrennt" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Drucker FW-Version weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Drucker FW-Version weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Drucker G-Code Level unterscheidet sich vom G-Code. Fortfahren?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Drucker-G-Code Level unterscheidet sich vom G-Code. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Printer gestoppt. kill() aufgerufen!" 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 Kalibrie- rungsablauf." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Druckermodell unterscheidet sich vom G-Code. Fortfahren?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Das Druckermodell unterscheidet sich vom G-Code. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 bereit." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 bereit." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Druck wiederherst " @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Erneuern" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Umbenennen" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Wiederholen: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Ruecksetzen" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "XYZ Kalibr. zuruecksetzen." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Druck fortgesetzt" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Rechts" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Rechts [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Knopf drehen bis die Markierung das Extrudergehaeuse erreicht. Klicken wenn fertig." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "SD Karte [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "SD Karte [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD drucke Byte " msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Auswahl" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Waehle Sprache" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "PLA Filament auswaehlen:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selbsttest misslung " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Sensor Info" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Sensorstatus" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Sensoren Info" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Temp. einstellen:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Einstellungen" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Schwerer Schraeglauf" @@ -1727,8 +2002,13 @@ msgstr "Schwerer Schraeglauf" msgid "Severe skew:" msgstr "Schwerer Verzug:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Blech" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Endschalter Status" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "Schlafzustand..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Leichter Schraeglauf" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Etwas verzogen:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "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." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Sort. [ohne]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Sort. [Zeit]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Sort. [Alphabetisch]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Sort.: [Zeit]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sound [laut]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sound [stumm]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sound [einmal]" +# +#: +msgid "Sound [assist]" +msgstr "Sound [assist]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Sound [blind]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Dreht sich" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/V]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [aus]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich" # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiken " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Stahlbleche" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Schrittrate zu hoch: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "GESTOPPT. " # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Support" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Ausgetauscht" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Temp. Kal. [AN]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Temp. Kal. [AUS]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatur" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Temperatur wurde\nnoch nicht\nkalibriert" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperaturen" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "zum Filament laden" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "zum Filament entladen" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Gesamt" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Gesamtes Filament" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Gesamtes Filament:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Gesamte Druckzeit" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "AUSGELOEST" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "unbekannt" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Entladen" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Alles entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Filament entladen" @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Filam. 4 entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Spannungen" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "Dateisystem Init fehlerhaft" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekuehlt sind" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "WARNUNG:\nCrash-Erkennung\nim Stealth Modus\nausgeschaltet" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geaendert." # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "WARNUNG: Dies ist\neine inoffizielle,\nnicht unterstuetzte\nVersion. Benutzung\nauf eigene Gefahr!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Assistent" @@ -2117,23 +2432,28 @@ msgstr "Schreibe in Datei: " msgid "X-correct" msgstr "X-Korrektur" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "X-Korrektur:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schraeglauf wird automatisch korrigiert." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Vordere Kalibrierpunkte nicht erreichbar." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Linker vorderer Kalibrierpunkt nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glueckwunsch!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Y Entfernung vom Min" @@ -2192,8 +2512,13 @@ msgstr "Y Entfernung vom Min:" msgid "Y-correct" msgstr "Y-Korrektur" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Y-Korrektur:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Ja" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Sie benutzen eine\nBeta Firmware\nVersion. Dies ist\neine Entwicklungs-\nversion. Die Ver-\nwendung ist nicht\nempfohlen und kann\nzu Schaeden fuehren." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Z-Korrektur:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-Probe Nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-Probe Nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" diff --git a/lang/po/new/es.po b/lang/po/new/es.po index 9ceb0eef..8f4d21b5 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -17,6 +17,11 @@ msgstr "\e[2JDec. choque\e[1;0Hpuede ser activada solo en\e[2;0HModo normal" msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATENCION:\e[1;0HDec. choque\e[2;0Hdesactivada en\e[3;0HModo silencio" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " de 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [apagado]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Cancelar" @@ -77,33 +87,38 @@ msgstr ">Cancelar" msgid "Adjusting Z" msgstr "Ajustar Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ajustando Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Todos" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" @@ -115,17 +130,17 @@ msgstr "Ajustar Eje Z" # MSG_AUTO_DEPLETE_ON c=17 r=1 #: ultralcd.cpp:4706 msgid "Auto deplete [on]" -msgstr "Auto desplegar[on]" +msgstr "Auto agotar[on]" # #: ultralcd.cpp:4702 msgid "Auto deplete[N/A]" -msgstr "Auto desplegar[N/A]" +msgstr "Auto agotar[N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 #: ultralcd.cpp:4710 msgid "Auto deplete[off]" -msgstr "Auto desplegar[off]" +msgstr "Auto agotar[off]" # MSG_AUTO_HOME #: messages.c:11 @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longitud del eje" @@ -167,13 +182,18 @@ msgstr "Micropasos X" msgid "Babystepping Y" msgstr "Micropasos Y" +# +#: messages.c:57 +msgid "Back" +msgstr "atras" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Base calefactable " # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Comienzo lista arch. " # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Estado de la correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibrar" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibrar E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibracion" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibracion OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Cancelar" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Tarjeta insertada" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Tarjeta retirada" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Cambiar tarjeta SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Cambio correcto?" @@ -328,44 +348,49 @@ msgid "Changing filament!" msgstr "Cambiando filamento" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Comprobando los sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Control sensor Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Comprobaciones" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " -msgstr "inconcluencia checksum, Ult. Linea: " +msgstr "error de checksum, Ult. Linea: " # MSG_CHOOSE_EXTRUDER c=20 r=1 #: messages.c:49 @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Elije filamento:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Color no homogeneo" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copiar idioma seleccionado desde XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Choque" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Detect. choque solo\npuede activarse en\nmodo Normal" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Apagar motores" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y 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." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" @@ -462,13 +492,18 @@ msgstr "E calibrado. Limpia nozzle. Haz clic una vez terminado." msgid "E-correct" msgstr "E-correcion" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correccion-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Expulsar" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Expulsar filamento" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Expulsar filamento 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Expulsando filamento" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fin lista arch. " # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Endstop" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Endstops" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "en cola \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERROR:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extrusor 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilador del extrusor:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Informacion del extrusor" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Estadistica de fallos" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falsa activación" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Velocidad Vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "La respuesta del sensor de fil es deficiente, ?desactivarlo?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. acabado" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensor de filamento" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Sensor de filamento:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filamento usado" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamento usado: " # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -717,53 +757,103 @@ msgstr "Arch. abierto: " msgid "File selected" msgstr "Arch. elegido" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Term. movimientos" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [ninguno]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [aviso]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [estricto]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 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." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrige el problema y pulsa el boton en la unidad MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "Código G laminado para un nivel diferente. ¿Continuar?" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "Código G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresión cancelada." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Código G laminado para un tipo de impresora diferente. ¿Continuar?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "Código G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresión cancelada." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Código G laminado para nuevo firmware. ¿Continuar?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Código G laminado para nuevo firmware. Por favor actualiza el firmware. Impresión cancelada." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Calentando..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Calentamiento acabado." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 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?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Configuracion HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Mejorando punto de calibracion base" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Monitorizar" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Iniciar tarj. SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Introducir filamento" @@ -848,29 +943,34 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Insertar filamento en el extrusor 4. Haz clic una vez terminado." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "?Esta cargado el filamento 1?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "?Esta colocada la lamina de acero sobre la base?" +msgstr "¿Esta colocada la lamina de acero sobre la base?" # MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 #: mesh_bed_calibration.cpp:2223 @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "PARADA DE EMERGENCIA" # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ultima impresion" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Izquierda" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Izquierda [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Izda:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Intr. todos fil." @@ -955,15 +1055,15 @@ msgstr "Introducir fil. 4" # MSG_LOAD_FILAMENT_5 c=17 #: ultralcd.cpp:5582 msgid "Load filament 5" -msgstr "Cargar filamento 5" +msgstr "Introducir fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Cambiando color" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Polea suelta" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Extrusor invalido" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." @@ -1012,8 +1112,23 @@ msgstr "M218 Extrusor invalido" msgid "M221 Invalid extruder " msgstr "M221 Extrusor invalido" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. imanes [On]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. imanes [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. imanes [Off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principal" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Marque el filamento 100 mm por encima del final del extrusor. Haz clic una vez terminado." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Desviacion medida:" @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Desviación medida:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Malla [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Malla [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Nivelacion Malla Base" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detectado en impresora MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectado en impresora MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Fallos MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Carga MMU falla" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Modo MMU [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Modo MMU [Silencioso]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU necesita atencion del usuario. Corrija el problema y luego presione el boton en la unidad MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Restaurando posicion..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Fallo de energia en MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 conectado" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silencio]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silencio]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modo[fuerza auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Modo [rend.pleno]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modelo [ninguno]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modelo [aviso]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modelo [estricto]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motor" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Mover Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "No disponible" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "No" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Sin Checksum con linea numero, Ult. Linea: " # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "No hay tarjeta SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Sin termistores - sin temperatura" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "No hay conexion " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 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." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." -msgstr "Voy a precalentar la boquilla para PLA ahora." +msgstr "Ahora precalentare la boquilla para PLA ." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Boquilla" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Nozzle [ninguno]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Nozzle [aviso]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Nozzle [estricto]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. nozzle [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. nozzle [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. nozzle [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventilador de capa" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 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" @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "fallo openRoot " # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pausar impresion" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Esc. Modelo Adecuado" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Calentando PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -1313,67 +1518,67 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserta, por favor, filamento PLA en el extrusor. Despues haz clic para cargarlo." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Por favor introduce el filamento al primer tubo MMU, despues presiona el dial para imprimirlo." # MSG_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8 #: ultralcd.cpp:4109 msgid "Please load PLA filament and then resume Wizard by rebooting the printer." -msgstr "Carga filamento PLA, por favor, y reinicia la impresora para continuar con el Wizard" +msgstr "Carga filamento PLA y reinicia la impresora para continuar con el asistente" # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Por favor coloca la chapa de acero en la base calefactable." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Por favor quite el filamento y luego presione el dial." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Por favor retire la chapa de acero de la base calefactable." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Por favor actualice el firmware en tu MMU2. Esperando el reseteo." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Cortes de energia" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Encendido" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Precalentar" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Precalentando para laminar" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Precalentar para expulsar" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Precalentar para cargar" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Precalentar para descargar" @@ -1428,52 +1643,52 @@ msgid "Prepare new filament" msgstr "Preparar filamento" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Pulsa el dial" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventilador del extrusor" -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 -msgid "Print fan:" -msgstr "Ventilador del fusor:" - # MSG_INFO_PRINT_FAN c=11 r=1 #: ultralcd.cpp:1549 msgid "Print FAN: " msgstr "Ventilador del fusor:" +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8221 +msgid "Print fan:" +msgstr "Ventilador del fusor:" + # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" msgstr "Menu tarjeta SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Impresion en pausa" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Tiempo de imp.:" @@ -1487,6 +1702,26 @@ msgstr "Tiempo de imp.:" msgid "Printer disconnected" msgstr "Impresora desconectada" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "FW Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "FW Impresora difiere de cod. G. Comprueba los valores en ajustes. Impresion cancelada." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Nivel cod.G Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Nivel cod.G Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresión cancelada." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Impresora detenida. kill() activado!" 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." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modelo Impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Modelo Impresora difiere de cod. G. Comprueba los valores en ajustes. Impresión cancelada." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro nozzle impresora difiere de cod.G. ¿Continuar?" + +# +#: util.cpp:397 +msgid "Printer 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_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Preparado para i3 MK2." msgid "Prusa i3 MK2.5 ready." msgstr "Preparado para Prusa i3 MK2.5." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recuperando impresion" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Refrescar" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Renombrar" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Reenviar: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset XYZ calibr." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" -msgstr "Resumiendo impresion" +msgstr "Continuando impresion" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Derecha" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Derecha [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Rotar el dial hasta que la marca llegue al cuerpo del extrusor. Haz clic una vez terminado." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Tarj. SD [FlshAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD byte impresion" msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Seleccionar" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Cambiar el idioma" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Seleccionar filamento PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Self test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 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." # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info sensor" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Estado del sensor" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Informacion sensores" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Establecer temp.:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Configuracion" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Inclinacion severa" @@ -1727,8 +2002,13 @@ msgstr "Inclinacion severa" msgid "Severe skew:" msgstr "Inclinación severa:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Lamina" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Mostrar endstops" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "En reposo..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Ligeramente inclinado" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Ligeramente inclinado:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Ordenar [ninguno]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Ordenar [tiempo]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Ordenar [Alfabetico]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Ordenar: [tiempo]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Sonido [alto]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Sonido[silenciad]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Sonido [una vez]" +# +#: +msgid "Sound [assist]" +msgstr "Sonido [asistido]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Sonido [ciego]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Ventilador girando" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Estadisticas " +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Lámina de acero" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Pasos muy altos: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Intercambiado" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Cal. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Cal. temp. [OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "La temperatura de calibracion no ha sido ajustada" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibracion temperatura terminada. Haz clic para continuar." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperaturas" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "para descargar el filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Total" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filamento total:" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filamento total:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Tiempo total :" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "ACTIVADO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "desconocido" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Descargar" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Soltar todos fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Soltar filamento" @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Soltar fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Voltajes" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "fallo volume.init \n" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATENCION:\nDetect. choque \ndesactivada en\nmodo Silencioso" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "CUIDADO: Esta es una version no-oficial y sin soporte. ¡Usala bajo tu responsabilidad!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" -msgstr "?Se cargocon exito el filamento?" +msgstr "?Se cargo con exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Wizard" @@ -2117,23 +2432,28 @@ msgstr "Escribiendo al arch.: " msgid "X-correct" msgstr "X-correcion" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correccion-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La inclinacion se corregira automaticamente." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 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 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distancia en Y desde el min" @@ -2190,10 +2510,15 @@ msgstr "Distancia en Y desde el min:" # #: ultralcd.cpp:4886 msgid "Y-correct" -msgstr "Y-correcion" +msgstr "Y-correccion" + +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correccion-Y:" # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" @@ -2205,14 +2530,29 @@ msgstr "Estas usando una version alpha de firmware. Esta es una version de desar # MSG_FW_VERSION_BETA c=20 r=8 #: Marlin_main.cpp:931 msgid "You are using firmware beta version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Estás usando una versión beta de firmware. Es una versión en desarrollo. No recomendamos que la uses y podría causar daños a la impresora." +msgstr "Estas usando una version beta de firmware. Es una version en desarrollo. No recomendamos que la uses y podria causar daños a la impresora." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Wizard" +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correccion-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-sensor nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-sensor nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] punto offset" diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index 38ff850d..cd2975bc 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -17,6 +17,11 @@ msgstr "\e[2JLa detection de crash peut etre\e[1;0Hactive seulement\e[2;0Hen mod msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATTENTION :\e[1;0HDetection de crash\e[2;0H desactivee en\e[3;0Hmode Furtif" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr "de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "de 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[off]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Annuler" @@ -77,33 +87,38 @@ msgstr ">Annuler" msgid "Adjusting Z" msgstr "Ajustement de Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ajuster Z :" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Tous" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne\nimpression !" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche +\ndroite tout en haut?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoCharge du filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du\nfilament uniquement\nsi le capteur de\nfilament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto du\nfilament actif,\nappuyez sur le btn\net inserez le fil." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Longueur de l'axe" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Retour" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Lit" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Corr. niveau plateau" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Debut liste fichiers" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee.\nRecup. impression ?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibrer" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibrer E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de XYZ.\nTournez le bouton\npour monter le\nchariot de l'axe Z\njusqu'aux butees.\nCliquez une fois\nfait." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibration de Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibration de Z.\nTournez le bouton\npour monter le\nchariot de l'axe Z\njusqu'aux butees.\nCliquez une fois\nfait." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibration" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibration terminee" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Annuler" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Carte inseree" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Carte retiree" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Changer carte SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Change correctement?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Changement filament!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verification du lit" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifications butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verif. tete impr." # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verification axe Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Verifications" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Choix du filament :" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copier la langue selectionne depuis la XFLASH ?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copier la langue\nselectionne ?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Crash" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression ?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "La detection de\ncrash ne peut etre\nactive en mode\nNormal" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Date :" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "La distance entre la\npointe de la buse et\nla surface du\nplateau n'a pas\nencore ete reglee.\nSuivez le manuel,\nchapitre Premiers\npas, section\nCalibration de la\npremiere couche." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous repeter\nla derniere etape\npour reajuster la\ndistance entre la\nbuse et le plateau\nchauffant ?" @@ -462,13 +492,18 @@ msgstr "Calibration de E\nterminee. Nettoyez\nla buse. Cliquez une\nfois fait." msgid "E-correct" msgstr "Correct-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correct-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Ejecter" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Ejecter le fil." @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Ejecter fil. 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Ejection filament" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fin liste fichiers" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Butees" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "mise en file \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire\nstatique a ete\necrasee" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERREUR :" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR : Le capteur\nde filament ne\nrepond pas, verifiez\nle branchement." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Extrudeur 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Infos extrudeur" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "ChargAuto f. [on]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "AutoCharg F [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "AutoCharg F [off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statist. d'echec" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Stat. echecs MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Faux declenchement" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Vitesse ventil" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Verif ventilo[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Verif venti [off]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Capteur de fil. non\nprecis, desactiver ?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Capteur Fil. [N/A]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Fins de filament" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et\navec bonne couleur ?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Capteur de filament" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Capteur filament :" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filament utilise" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filament utilise :" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet.\nContinuer qd meme ?" @@ -717,53 +757,93 @@ msgstr "Fichier ouvert :" msgid "File selected" msgstr "Fichier selectionne" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA :" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Mouvements de fin" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [aucune]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [avert]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware[stricte]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais\nlancer le Selftest\npour verifier les\nproblemes\nd'assemblage les\nplus communs." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton de l'unite MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventilo impr avant ?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventilos avt/gauche" +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" + +# +#: util.cpp:433 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee. " + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" @@ -773,7 +853,7 @@ msgid "Heating" msgstr "Chauffe" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Chauffe desactivee\npar le compteur de\nsecurite." @@ -783,27 +863,32 @@ msgid "Heating done." msgstr "Chauffe terminee." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Bonjour, je suis\nvotre imprimante\nOriginal Prusa i3.\nVoulez-vous que je\nvous guide a travers\nle processus\nd'installation ?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Config HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Je vais maintenant\nlancer la\ncalibration xyz.\nCela prendra 12 min\nenviron." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Je vais maintenant\nlancer la\ncalibration z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Je vais commencer a \nimprimer une ligne\net vous baisserez au\nfur et a mesure la\nbuse en tournant le\nbouton jusqu'a\natteindre la hauteur\noptimale. Regardez\nles photos dans\nnotre manuel au\nchapitre Calibration" @@ -813,7 +898,7 @@ msgid "Improving bed calibration point" msgstr "Amelioration du point de calibration du lit" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ecran d'info" @@ -823,7 +908,7 @@ msgid "Init. SD card" msgstr "Init. carte SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserez le filament" @@ -848,27 +933,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Inserez le filament\ndans l'extrudeur 4.\nCliquez une fois\npret." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR :" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Le filament 1 est-il charge ?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Le filament est-il\ncharge ?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Est-ce du filament\nPLA ?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Le filament PLA\nest-il charge ?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Feuille d'acier sur\nplateau chauffant ?" @@ -883,27 +973,27 @@ msgid "KILLED. " msgstr "TUE." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Derniere impression" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Echecs derniere impr" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Gauche" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Gauche [um]" @@ -913,7 +1003,7 @@ msgid "Left:" msgstr "Gauche :" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correction lin." @@ -923,7 +1013,7 @@ msgid "Live adjust Z" msgstr "Ajuster Z en direct" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Tout charger" @@ -958,12 +1048,12 @@ msgid "Load filament 5" msgstr "Charger fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Charger dans la buse" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Chargement couleur" @@ -973,7 +1063,7 @@ msgid "Loading filament" msgstr "Chargement filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Poulie lache" @@ -993,7 +1083,7 @@ msgid "M109 Invalid extruder " msgstr "M109 extrudeur invalide" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" @@ -1012,8 +1102,23 @@ msgstr "M218 extrudeur invalide" msgid "M221 Invalid extruder " msgstr "M221 extrudeur invalide" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. aimants [On]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. aimants[N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. aimants[Off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Principal" @@ -1023,7 +1128,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Marquez le filament\na 100 mm du corps de\nl'extrudeur. Cliquez\nune fois fait." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Deviation mesuree" @@ -1033,32 +1138,67 @@ msgid "Measured skew:" msgstr "Ecart mesure :" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Mesure de la hauteur de reference du point de calibration" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh bed leveling" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detecte sur imprimante MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detecte sur imprimante MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Echec MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Echecs charg. MMU" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Mode MMU [Normal]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Mode MMU [Furtif]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." @@ -1068,82 +1208,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "La MMU requiert votre attention. Réglez le problème puis appuyez sur le bouton on sur l'unité MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Remontee en\ntemperature..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Echecs alim. MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 connecte" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Mode [Normal]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Mode [silencieux]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Mode [Furtif]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Changement de mode en cours..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [haute puiss]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modele [aucune]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modele [avert]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modele [stricte]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Deplacer Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1313,7 @@ msgid "New firmware version available:" msgstr "Nouvelle version de\nfirmware disponible:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Non" @@ -1168,12 +1328,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Pas de checksum avec\nnumero de ligne, \nDerniere ligne :" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Pas de carte SD" @@ -1183,37 +1343,67 @@ msgid "No thermistors - no temperature" msgstr "Pas de thermistors\n- pas de temperature" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connecte" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 msgid "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Maintenant je vais\ncalibrer la distance \nentre la pointe de\nla buse et la\nsurface du plateau\nchauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais\nprechauffer la buse\npour du PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la feuille d'acier." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Buse" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Buse [aucune]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Buse [avert]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Buse [stricte]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. buse [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. buse [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. buse [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventilateur buse" @@ -1238,7 +1428,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages\ntrouves. Le PID, les\nEsteps etc. par\ndefaut seront regles" @@ -1258,7 +1448,7 @@ msgid "openRoot failed" msgstr "Echec openRoot" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Pause de l'impr." @@ -1268,42 +1458,47 @@ msgid "Pick print" msgstr "Choisir impression" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA :" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Placez une feuille\nde papier sous la\nbuse pendant la\ncalibration des 4\npremiers points.\nSi la buse accroche\nle papier, eteignez\nvite l'imprimante." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifiez :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de verifier\nnotre manuel et de\ncorriger le\nprobleme. Poursuivez\nalors l'assistant en\nredemarrant\nl'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez le plateau\nchauffant et appuyez\nsur le bouton." @@ -1313,12 +1508,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse\npour la calibration.\nCliquez une fois\nfait." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Inserez du filament\nPLA dans l'extrudeur\npuis appuyez sur le\nbouton pour le\ncharger." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Veuillez inserer du filament PLA dans le premier tube du MMU, et pressez sur le bouton pour le charger." @@ -1328,52 +1523,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Chargez le filament\nPLA et poursuivez\nl'assistant en\nredemarrant\nl'imprimante." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Chargez d'abord le\nfilament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et\nretirez le filament\nmanuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Placez la feuille\nd'acier sur le\nplateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le\nbouton pour \ndecharger le \nfilament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Retirez\nimmediatement le\nfilament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Veuillez retirer le filament puis appuyez sur le bouton." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Veuillez retirer d'abord les protections d'envoi." # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la feuille\nd'acier du plateau\nchauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Veuillez mettre a\njour le firmware de\nvotre MMU2. En\nattente d'un reset." @@ -1383,12 +1578,12 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Coupures de courant" @@ -1398,27 +1593,37 @@ msgid "PowerUp" msgstr "Demarrage" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Prechauffage" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la\nbuse. Merci de\npatienter." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Prechauffage pour couper" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Prechauffage pour ejecter" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Chauffe pour charger" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Chauffe pr decharger" @@ -1428,27 +1633,27 @@ msgid "Prepare new filament" msgstr "Preparez le filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le\nbouton pour\nprechauffer la buse\net continuer." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "App. sur sur bouton" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventilo impression" @@ -1458,7 +1663,7 @@ msgid "Print FAN: " msgstr "Vent impr :" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventilo impr. :" @@ -1468,12 +1673,12 @@ msgid "Print from SD" msgstr "Impr depuis la SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Impression en pause" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Temps d'impression" @@ -1487,6 +1692,26 @@ msgstr "Temps d'impression :" msgid "Printer disconnected" msgstr "Impri. deconnectee" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Version FW de l'imprimante differente du G-Code. Continuer ?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Version FW de l'imprimante differente du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Niveau de G-Code de l'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Merci de verifier le parametre dans les reglages. Impression annulee." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1722,26 @@ msgstr "Imprimante stoppee.\nkill() appelee !" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "L'imprimante n'a pas\nencore ete calibree.\nSuivez le manuel,\nchapitre Premiers\npas, section\nProcessus de\ncalibration." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modele d'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Modele d'imprimante diffent du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametre de la buse de l'imprimante different du G-Code. Continuer ?" + +# +#: util.cpp:397 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Diametre de la buse de l'imprimante different du G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1757,11 @@ msgstr "Prusa i3 MK2 prete." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 prete." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1773,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recup. impression" @@ -1543,10 +1793,15 @@ msgid "Refresh" msgstr "Rafraichir" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 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." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Renommer" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1818,32 @@ msgid "Resend: " msgstr "Renvoi :" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reinitialiser" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reinit. calibr. XYZ" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Reprise de l'impr." # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Droite" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Droite [um]" @@ -1603,22 +1858,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Tournez le bouton\njusqu'a ce que la\nmarque atteigne le\ncorps de\nl'extrudeur. Cliquez\nune fois fait." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancer l'Assistant\nsupprimera les\nresultats actuels de\ncalibration et\ncommencera du debut.\nContinuer ?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Carte SD [normal]" @@ -1633,7 +1888,7 @@ msgid "SD card [FlshAir]" msgstr "Carte SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Carte SD [flashAir]" @@ -1652,53 +1907,63 @@ msgstr "Octet d'impression de la SD" msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du lit" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Selectionner" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Choisir langue" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Selectionnez le filament PLA :" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Erreur auto-test !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera\nlance pour calibrer\nla remise a zero\nprecise sans capteur" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info capteur" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Etat capteur" @@ -1708,17 +1973,17 @@ msgid "Sensors info" msgstr "Infos capteurs" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Regler temp. :" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Reglages" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Deviation severe" @@ -1727,8 +1992,13 @@ msgstr "Deviation severe" msgid "Severe skew:" msgstr "Ecart severe :" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Feuille" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Afficher butees" @@ -1743,7 +2013,7 @@ msgid "Sleep..." msgstr "Repos..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Deviation legere" @@ -1753,15 +2023,30 @@ msgid "Slight skew:" msgstr "Leger ecart :" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Certains fichiers ne\nseront pas tries.\nMax 100 fichiers\ntries par dossier." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problemes rencontres, nivellement de l'axe Z applique..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Tri [aucun]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Tri [date]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Tri [alphabet]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2088,132 @@ msgid "Sort: [time]" msgstr "Tri : [heure]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Son [fort]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Son [muet]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Son [une fois]" +# +#: +msgid "Sound [assist]" +msgstr "Son [Assist]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Son [aveugle]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Son [silencieux]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Tourne" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature\nambiante stable de\n21-26C et un support\nstable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiques" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Plaques en acier" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Nombre de pas trop eleve :" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Support" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Echange" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperature" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Echec de la\ncalibration en\ntemperature" @@ -1923,12 +2223,12 @@ msgid "Temperature calibration has not been run yet" msgstr "La calibration en\ntemperature n'a pas\nencore ete lancee" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "La calibration en\ntemperature est\nterminee et activee.\nLa calibration en\ntemperature peut\netre desactivee dans\nle menu Reglages->\nCal. Temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperatures" @@ -1938,27 +2238,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "pour decharger fil." # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Total" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filament total" @@ -1968,7 +2268,7 @@ msgid "Total filament :" msgstr "Total filament :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Temps total impr." @@ -1983,17 +2283,17 @@ msgid "TRIGGERED" msgstr "ACTIVE" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "inconnu" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Decharger" @@ -2003,7 +2303,7 @@ msgid "Unload all" msgstr "Decharger tout" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Decharger fil." @@ -2028,22 +2328,22 @@ msgid "Unload filament 4" msgstr "Decharger fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Utilisez decharger pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Tensions" @@ -2053,32 +2353,37 @@ msgid "volume.init failed" msgstr "Echec volume.init" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du\nrefroidissement des\nbuse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Attente du\nrefroidissement de\nla sonde PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATTENTION :\nDetection de crash\ndesactivee en mode\nFurtif" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 msgid "Warning: both printer type and motherboard type changed." msgstr "Attention : Types\nd'imprimante et de\ncarte mere modifies" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Attention : Type de\ncarte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Attention : Type\nd'imprimante modifie" @@ -2088,17 +2393,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "ATTENTION : ceci est\nune build non\nofficielle et non\nsupportee. Utilisez\nla a votre propre\nrisque !" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Dechargement du\nfilament reussi ?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Assistant" @@ -2117,23 +2422,28 @@ msgstr "Ecriture dans le fichier :" msgid "X-correct" msgstr "Correction-X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correct-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Details calib. XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibration XYZ OK.\nL'ecart sera corrige\nautomatiquement." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibration XYZ OK.\nLes axes X/Y sont\nlegerement non\nperpendiculaires.\nBon boulot !" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ\ncompromise. Les\npoints de\ncalibration avant ne\nsont pas\natteignables." @@ -2143,17 +2453,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibration XYZ\ncompromise. Le point\n de calibration\n avant gauche n'est\n pas atteignable." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ\ncompromise. Le point\nde calibration avant\ndroit n'est pas\natteignable." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration\nXYZ. Le point de\ncalibration du\nplateau n'a pas ete\ntrouve." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration\nXYZ. Les points de\ncalibration avant ne\nsont pas\natteignables." @@ -2168,17 +2478,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration\nXYZ. Consultez le\nmanuel." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration\nXYZ. Le point de\ncalibration avant\ndroit n'est pas\natteignable." # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibration XYZ OK.\nLes axes X/Y sont\nperpendiculaires.\nFelicitations !" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distance Y du min" @@ -2192,8 +2502,13 @@ msgstr "Distance Y du mini :" msgid "Y-correct" msgstr "Correction-Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correct-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Oui" @@ -2208,11 +2523,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Vous utilisez un\nfirmware en version\nbeta. C'est une\nversion de dev.\nCeci n'est pas\nrecommande et peut\nendommager\nl'imprimante." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours\nrelancer l'assistant\ndans Calibration->\nAssistant." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correct-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Sonde-Z num. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Sonde-Z num. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "Offset point [0;0]" diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 17a88248..c226463b 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -17,6 +17,11 @@ msgstr "\e[2JRilev. impatto\e[1;0Hattivabile solo\e[2;0Hin Modalita normale" msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JATTENZIONE:\e[1;0HRilev. impatto\e[2;0Hdisattivato in\e[3;0HModalita silenziosa" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr " 1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr "su 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [off]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Annulla" @@ -77,33 +87,38 @@ msgstr ">Annulla" msgid "Adjusting Z" msgstr "Compensazione Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Compensazione Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Tutti" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Caricamento auto. filam. disp. solo con il sensore attivo..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Lunghezza dell'asse" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Indietro" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Letto" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Inizio lista file" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stato delle cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "C'e stato un Blackout. Recuperare la stampa?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Calibra" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Calibra E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Calibrazione" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Calibrazione completa" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Annulla" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "SD inserita" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "SD rimossa" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Cambia memoria SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Cambiato correttamente?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Cambiando filam." # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Verifica asse Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Controlli" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Scegliere filamento:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Colore non puro" @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Copiare la lingua selezionata da XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Impatto" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Rilevamento impatto può\nessere attivato in\nModalità Normale" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Disabilita motori" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Distanza tra la punta dell'ugello e la superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo layer." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 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?" @@ -462,13 +492,18 @@ msgstr "Calibrazione E terminata. Si prega di pulire l'ugello. Click per continu msgid "E-correct" msgstr "Correzione-E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Correzione-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Espellere" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Espelli filamento " @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Espelli filamento 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Espellendo filamento " @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Fine lista file" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Finecorsa" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "accodamento\"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e stata sovrascritta" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "ERRORE:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Estrusore 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Ventola estrusore:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Info estrusore" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autocar.filam[on]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statistiche fallimenti" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Statistiche fallimenti MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falso innesco" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Velocita ventola" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" -msgstr "Controllo ventole [on]" +msgstr "Control.vent[on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Control.vent[off]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Risposta Sens. Fil. debole, disattivare? " # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Sensor filam[N/A]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Sensor filam[off]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Filam. esauriti" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Sensore filam." @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Sensore filam.:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Filamento utilizzato" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Filamento usato:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -717,53 +757,103 @@ msgstr "File aperto: " msgid "File selected" msgstr "File selezionato" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Finalizzando gli spostamenti" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [nessuno]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [avviso]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [esatto]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Calibrazione primo layer." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 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." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvi il problema e quindi premi il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code processato per un livello diverso. Continuare?" + +# +#: util.cpp:516 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code processato per una stampante diversa. Continuare?" + +# +#: util.cpp:433 +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." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code processato per un firmware più recente. Continuare?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-code processato per un firmware più recente. Per favore aggiorna il firmware. Stampa annullata." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Riscald./Termist." @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Riscald. completo" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Installazione HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Perfezion. punto di calibraz. letto" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Schermata info" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Inizializza scheda SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserire filamento" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Inserire filamento nell'estrusore 4. Click per continuare" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Il filamento 1 e caricato?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "La piastra d'acciaio e sul piano riscaldato?" @@ -883,29 +983,29 @@ msgid "KILLED. " msgstr "IN TILT." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ultima stampa" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Sinistra" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" -msgstr "Lato sinistro [um]" +msgstr "Sinistra [um]" # MSG_LEFT c=12 r=1 #: ultralcd.cpp:2308 @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Sinistra:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Correzione lin." @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Caricare tutti" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Caricare fil. 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Caricando colore" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Puleggia lenta" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Estrusore non valido" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Calibrazione primo layer." @@ -1012,8 +1112,23 @@ msgstr "M218 Estrusore non valido" msgid "M221 Invalid extruder " msgstr "M221 Estrusore non valido" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Comp. Magneti [on]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Comp. Magneti [N/A]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Comp. Magneti [off]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu principale" @@ -1023,9 +1138,9 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Segnare il filamento a 100 mm di distanza dal corpo dell'estrusore. Click per continuare." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" -msgstr "Disassamento misurato" +msgstr "Deviazione misurata" # MSG_MEASURED_SKEW c=15 r=1 #: ultralcd.cpp:2335 @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Distorsione misurata:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Griglia [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Griglia [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Mesh livel. letto" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Mesh livel. letto" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Rilevato firmware MK3 su stampante MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S rilevato su stampante MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Fallimenti MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Modalità MMU [Normale]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Modalità MMU [Silenziosa]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU richiede l'attenzione dell'utente. Risolvi il problema e quindi premi il bottone sull'unità MMU. " # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. riprendendo la posizione... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Mancanza corrente MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU2 connessa" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Modo [normale]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Modo [silenzioso]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Modo [Silenziosa]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Cambio modalità in corso ..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Modo [auto]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Mode [forte]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Modello [nessuno]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Modello [avviso]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Modello [esatto]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" -msgstr "Muovi X" +msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" -msgstr "Muovi Y" +msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" -msgstr "Muovi Z" +msgstr "Sposta Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/A" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "No" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Nessun checksum con numero di riga, ultima riga:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Nessuna SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "No termistore - no temperatura" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Non connesso" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Ugello" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Ugello [nessuno]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Ugello [avviso]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Ugello [esatto]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Diam. Ugello [0.25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Diam. Ugello [0.40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Diam. Ugello [0.60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Ventola estrusore" @@ -1238,9 +1438,9 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" +msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # MSG_ENDSTOP_OPEN #: messages.c:29 @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "openRoot fallito" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Metti in pausa" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Scegli stampa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Posizionare un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere subito la stampante." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 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." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -1313,12 +1518,12 @@ 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=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Per favore inserite del filamento PLA nel primo tubo del MMU, poi premete la manopola per caricarlo." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Per favore carica filamento di PLA e riprendi il Wizard dopo aver riavviato la stampante." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Per favore prima carica il filamento di PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 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=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Rimuovi il filamento e quindi premi la manopola. " # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Mancanza corrente" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Accendi" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Preriscalda" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Preriscaldamento per taglio" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Preriscaldamento per espulsione" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Preriscaldamento per caricare" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Preriscaldamento per scaricare" @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Preparare il nuovo filamento" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Premere la manopola" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Ventola di stampa" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Ventola di stampa:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Ventola di stampa:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Stampa da SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Stampa in pausa" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Tempo di stampa" @@ -1487,6 +1702,26 @@ msgstr "Tempo di stampa:" msgid "Printer disconnected" msgstr "Stampante sconnessa" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Versione FW stampante diversa dal G-Code. Continuare?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Versione FW stampante diversa dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Il livello G-code della stampante è diverso dal G-Code. Continuare?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Il livello G-code della stampante è diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Stampante ferma. kill () chiamato!" msgid "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, sezione Sequenza di Calibrazione." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Modello stampante diversa dal G-Code. Continuare?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Il modello stampante è diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro ugello diverso da G-Code. Continuare?" + +# +#: util.cpp:397 +msgid "Printer 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_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 pronta." msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 ready." +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK." + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK." # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Recupero stampa" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Refresh" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 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. " +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Rinomina" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Invia di nuovo: " # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Riprendi stampa" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Destra" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Destra [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Ruota la manopola finchè il segno raggiunga il corpo dell'estrusore. Clicca per continuare." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Mem. SD [normale]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Mem. SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD stampa byte " msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Seleziona" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Seleziona lingua" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Selezionate filamento PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info Sensore" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stato sensore" @@ -1708,27 +1983,32 @@ msgid "Sensors info" msgstr "Info Sensori" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Imposta temperatura:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Impostazioni" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" -msgstr "Disassamento grave" +msgstr "Deviazione grave" # MSG_SEVERE_SKEW c=15 r=1 #: ultralcd.cpp:2346 msgid "Severe skew:" msgstr "Distorsione grave:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Piano" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Stato finecorsa" @@ -1743,9 +2023,9 @@ msgid "Sleep..." msgstr "Sospensione..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" -msgstr "Disassamento lieve" +msgstr "Deviazione lieve" # MSG_SLIGHT_SKEW c=15 r=1 #: ultralcd.cpp:2342 @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Distorsione leggera:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Ordina [nessuno]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Ordina [tempo]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Ordine [alfabetico]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Ordina: [time]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Suono [forte]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Suono [mute]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Suono [singolo]" +# +#: +msgid "Sound [assist]" +msgstr "Suono [assistito]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Suono [cieco]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Gira" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [on]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/A]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [off]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 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 -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statistiche" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Piani d'acciaio" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Velocità passo troppo alta: " # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Scambiato" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Calib. temp. [ON]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Calib. temp.[OFF]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Calibrazione della temperatura non ancora eseguita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperature" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "per scaricare il filamento" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Totale" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Filamento totale" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filamento tot:" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Tempo di stampa totale" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "ATTIVATO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "sconosciuto" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Scarica" @@ -2003,9 +2313,9 @@ msgid "Unload all" msgstr "Rilasciare tutti" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" -msgstr "Scarica filam." +msgstr "Scarica filamento" # MSG_UNLOAD_FILAMENT_1 c=17 #: ultralcd.cpp:5406 @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Scarica filam. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Voltaggi" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "volume.init fallito" # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "ATTENZIONE:\nRilevamento impatto\ndisattivato in\nModalità Silenziosa" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "ATTENZIONE: Questo è un build non ufficiale, non supportato. Utilizzatelo a vostro rischio!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Wizard" @@ -2117,23 +2432,28 @@ msgstr "Scrittura su file: " msgid "X-correct" msgstr "Correzione-X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Correzione-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 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 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 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 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Distanza Y dal min" @@ -2192,8 +2512,13 @@ msgstr "Distanza Y da min:" msgid "Y-correct" msgstr "Correzione-Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Correzione-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Si" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "State utilizzando una versione beta del firmware. Questa versione è in via di sviluppo. L'utilizzo non è raccomandato e potrebbe causare danni alla stampante." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Correzione-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Z-probe nr. [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Z-probe nr. [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] punto offset" diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index 5596bc2c..e30df0e0 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -17,6 +17,11 @@ msgstr "\e[2JWykrywanie zderzen moze\e[1;0Hbyc wlaczone tylko w\e[2;0Htrybie Nor msgid "\e[2JWARNING:\e[1;0HCrash detection\e[2;0Hdisabled in\e[3;0HStealth mode" msgstr "\e[2JUWAGA:\e[1;0HWykrywanie zderzen\e[2;0Hwylaczone w\e[3;0Htrybie Stealth" +# +#: ultralcd.cpp:3913 +msgid " 1" +msgstr "1" + # MSG_PLANNER_BUFFER_BYTES #: Marlin_main.cpp:1184 msgid " PlannerBufferBytes: " @@ -48,10 +53,15 @@ msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:60 msgid " of 9" msgstr " z 9" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[wyl]" + # MSG_FACTOR #: ultralcd.cpp:6008 msgid " \002 Fact" @@ -68,7 +78,7 @@ msgid " \002 Min" msgstr " \002 Min" # -#: ultralcd.cpp:2353 +#: ultralcd.cpp:2294 msgid ">Cancel" msgstr ">Anuluj" @@ -77,35 +87,40 @@ msgstr ">Anuluj" msgid "Adjusting Z" msgstr "Dostrajanie Z" +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3144 +msgid "Adjusting Z:" +msgstr "Ustawianie Z:" + # MSG_ALL c=19 r=1 #: messages.c:11 msgid "All" msgstr "Wszystko" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:7459 +#: ultralcd.cpp:8209 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:95 +#: messages.c:101 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:2109 +#: ultralcd.cpp:1979 msgid "Ambient" msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2463 +#: ultralcd.cpp:2573 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3330 +#: ultralcd.cpp:3442 msgid "Are left and right Z~carriages all up?" -msgstr "Obydwa konce osi dojechaly do gornych ogranicznikow?" +msgstr "Obydwa konce osi sa na szczycie?" # MSG_ADJUSTZ #: ultralcd.cpp:2600 @@ -133,27 +148,27 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6091 +#: ultralcd.cpp:6731 msgid "AutoLoad filament" msgstr "AutoLadowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4246 +#: ultralcd.cpp:4375 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2655 +#: ultralcd.cpp:2768 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7130 +#: ultralcd.cpp:7865 msgid "Axis" msgstr "Os" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7128 +#: ultralcd.cpp:7863 msgid "Axis length" msgstr "Dlugosc osi" @@ -167,13 +182,18 @@ msgstr "Babystepping X" msgid "Babystepping Y" msgstr "Babystepping Y" +# +#: messages.c:57 +msgid "Back" +msgstr "Wstecz" + # MSG_BED #: messages.c:15 msgid "Bed" msgstr "Stol" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7072 +#: ultralcd.cpp:7807 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -188,7 +208,7 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5197 +#: ultralcd.cpp:5663 msgid "Bed level correct" msgstr "Korekta poziomowania stolu" @@ -213,17 +233,17 @@ msgid "Begin file list" msgstr "Poczatek listy plikowogranicznikow" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2135 +#: ultralcd.cpp:2007 msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:71 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4566 msgid "Calibrate" msgstr "Kalibruj" @@ -233,7 +253,7 @@ msgid "Calibrate E" msgstr "Kalibruj E" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5652 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -243,12 +263,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # -#: ultralcd.cpp:7461 +#: ultralcd.cpp:8211 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "Calibrating XYZ. 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." @@ -258,22 +278,22 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3290 +#: ultralcd.cpp:3405 msgid "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_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:61 msgid "Calibration" msgstr "Kalibracja" # MSG_HOMEYZ_DONE -#: ultralcd.cpp:778 +#: ultralcd.cpp:832 msgid "Calibration done" msgstr "Kalibracja OK" # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Cancel" msgstr "Anuluj" @@ -293,7 +313,7 @@ msgid "Card inserted" msgstr "Karta wlozona" # MSG_SD_REMOVED -#: ultralcd.cpp:7819 +#: ultralcd.cpp:8578 msgid "Card removed" msgstr "Karta wyjeta" @@ -313,12 +333,12 @@ msgid "Change SD card" msgstr "Wymien karte SD" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2474 +#: ultralcd.cpp:2584 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2551 +#: ultralcd.cpp:2661 msgid "Changed correctly?" msgstr "Wymiana ok?" @@ -328,40 +348,45 @@ msgid "Changing filament!" msgstr "Wymiana filamentu!" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:81 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:7450 +#: ultralcd.cpp:8200 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:7456 +#: ultralcd.cpp:8206 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:82 msgid "Checking sensors " msgstr "Sprawdzanie czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7451 +#: ultralcd.cpp:8201 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7452 +#: ultralcd.cpp:8202 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:7453 +#: ultralcd.cpp:8203 msgid "Checking Z axis " msgstr "Kontrola osi Z" +# +#: ultralcd.cpp:5537 +msgid "Checks" +msgstr "Testy" + # MSG_ERR_CHECKSUM_MISMATCH #: cmdqueue.cpp:444 msgid "checksum mismatch, Last Line: " @@ -378,7 +403,7 @@ msgid "Choose filament:" msgstr "Wybierz filament:" # MSG_NOT_COLOR -#: ultralcd.cpp:2563 +#: ultralcd.cpp:2673 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -393,12 +418,12 @@ msgid "Copy selected language from XFLASH?" msgstr "Skopiowac wybrany jezyk z XFLASH?" # -#: ultralcd.cpp:4360 +#: ultralcd.cpp:4499 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Crash" msgstr "Zderzenie" @@ -423,22 +448,27 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:608 +#: Marlin_main.cpp:618 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\nbe turned on only in\nNormal mode" +msgstr "Wykrywanie zderzen\nmoze byc wlaczone tylko\nw trybie Normalnym" + # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5804 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2235 +#: ultralcd.cpp:2106 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5093 +#: ultralcd.cpp:5552 msgid "Disable steppers" msgstr "Wylaczenie silnikow" @@ -448,7 +478,7 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:4828 +#: ultralcd.cpp:4968 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?" @@ -462,13 +492,18 @@ msgstr "Kalibracja E zakonczona. Oczysc dysze i potwierdz naciskajac pokretlo. " msgid "E-correct" msgstr "Korekcja E" +# MSG_EXTRUDER_CORRECTION c=10 +#: ultralcd.cpp:5032 +msgid "E-correct:" +msgstr "Korekcja-E:" + # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Eject" msgstr "Wysun" # MSG_EJECT_FILAMENT c=17 r=1 -#: ultralcd.cpp:6081 +#: messages.c:53 msgid "Eject filament" msgstr "Wysun filament" @@ -498,7 +533,7 @@ msgid "Eject filament 5" msgstr "Wysun filament 5" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1339 +#: mmu.cpp:1435 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" @@ -508,17 +543,17 @@ msgid "End file list" msgstr "Koniec listy plikow" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7090 +#: ultralcd.cpp:7825 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7096 +#: ultralcd.cpp:7831 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7078 +#: ultralcd.cpp:7813 msgid "Endstops" msgstr "Krancowki" @@ -538,7 +573,7 @@ msgid "enqueing \"" msgstr "kolejkowanie \"" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6132 +#: ultralcd.cpp:6773 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" @@ -553,7 +588,7 @@ msgid "ERROR:" msgstr "BLAD:" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4259 +#: ultralcd.cpp:4388 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -588,17 +623,17 @@ msgid "Extruder 4" msgstr "Ekstruder 4" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:7468 +#: ultralcd.cpp:8218 msgid "Extruder fan:" msgstr "Went. ekstrudera:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2266 +#: ultralcd.cpp:2137 msgid "Extruder info" msgstr "Informacje o ekstruderze" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:4927 +#: ultralcd.cpp:5066 msgid "F. autoload [on]" msgstr "Autolad. fil [wl]" @@ -608,37 +643,42 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:4929 +#: ultralcd.cpp:5068 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6112 +#: ultralcd.cpp:6757 msgid "Fail stats" msgstr "Statystyki bledow" # -#: ultralcd.cpp:6115 +#: ultralcd.cpp:6760 msgid "Fail stats MMU" msgstr "Bledy MMU" +# +#: ultralcd.cpp:7887 +msgid "False triggering" +msgstr "Falszywy alarm" + # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:78 msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5561 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5563 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -653,7 +693,7 @@ msgid "Fil. sensor response is poor, disable it?" msgstr "Reakcja czujnika slaba, wylaczyc?" # MSG_FSENSOR_NA -#: ultralcd.cpp:4907 +#: ultralcd.cpp:5046 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -663,7 +703,7 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Filam. runouts" msgstr "Konc. filamentu" @@ -678,12 +718,12 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy a kolor jest czysty?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2559 +#: ultralcd.cpp:2669 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: ultralcd.cpp:7144 +#: messages.c:84 msgid "Filament sensor" msgstr "Czujnik filamentu" @@ -693,7 +733,7 @@ msgid "Filament sensor:" msgstr "Czujnik filamentu:" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2725 +#: ultralcd.cpp:2838 msgid "Filament used" msgstr "Uzyty filament" @@ -703,7 +743,7 @@ msgid "Filament used: " msgstr "Uzywany filament:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:7595 +#: ultralcd.cpp:8346 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -717,53 +757,103 @@ msgstr "Otwarty plik:" msgid "File selected" msgstr "Wybrano plik" +# +#: ultralcd.cpp:3943 +msgid "FINDA:" +msgstr "FINDA:" + # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" msgstr "Konczenie druku" +# +#: ultralcd.cpp:5443 +msgid "Firmware [none]" +msgstr "Firmware [brak]" + +# +#: ultralcd.cpp:5446 +msgid "Firmware [warn]" +msgstr "Firmware [ostrzez.]" + +# +#: ultralcd.cpp:5449 +msgid "Firmware [strict]" +msgstr "Firmware [restr.]" + # MSG_V2_CALIBRATION c=17 r=1 -#: ultralcd.cpp:5177 +#: messages.c:105 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4740 +#: ultralcd.cpp:4880 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." # -#: mmu.cpp:640 +#: mmu.cpp:724 msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6205 +#: ultralcd.cpp:6846 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2228 +#: ultralcd.cpp:2099 msgid "forum.prusa3d.com" msgstr "forum.prusa3d.com" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:75 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3101 +#: ultralcd.cpp:3217 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7136 +#: ultralcd.cpp:7871 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code pociety na innym poziomie. Kontynuowac?" + +# +#: util.cpp:516 +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." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code pociety dla innej drukarki. Kontynuowac?" + +# +#: util.cpp:433 +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." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code pociety dla nowszego firmware. Kontynuowac?" + +# +#: util.cpp:483 +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." + # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7066 +#: ultralcd.cpp:7801 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" @@ -773,7 +863,7 @@ msgid "Heating" msgstr "Grzanie..." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:7475 +#: Marlin_main.cpp:8411 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -783,27 +873,32 @@ msgid "Heating done." msgstr "Grzanie zakonczone" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4719 +#: ultralcd.cpp:4859 msgid "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" msgstr "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" # MSG_PRUSA3D_HOWTO -#: ultralcd.cpp:2229 +#: ultralcd.cpp:2100 msgid "howto.prusa3d.com" msgstr "howto.prusa3d.com" +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Ustawienia HW" + # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4889 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4757 +#: ultralcd.cpp:4897 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4822 +#: ultralcd.cpp:4962 msgid "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." msgstr "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" @@ -813,7 +908,7 @@ msgid "Improving bed calibration point" msgstr "Poprawiam precyzje punktu kalibracyjnego" # MSG_WATCH -#: messages.c:93 +#: messages.c:99 msgid "Info screen" msgstr "Ekran informacyjny" @@ -823,7 +918,7 @@ msgid "Init. SD card" msgstr "Inicjalizacja karty SD" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2459 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Wprowadz filament" @@ -848,27 +943,32 @@ msgid "Insert filament into extruder 4. Click when done." msgstr "Wloz filament do ekstrudera 4. Potwierdz naciskajac pokretlo." # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:3947 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:4922 msgid "Is filament 1 loaded?" msgstr "Filament 1 zaladowany?" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4785 +#: ultralcd.cpp:4925 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4816 +#: ultralcd.cpp:4956 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4561 +#: ultralcd.cpp:4701 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:86 +#: messages.c:92 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" @@ -883,27 +983,27 @@ msgid "KILLED. " msgstr "PRZERWANE." # -#: ultralcd.cpp:1960 +#: ultralcd.cpp:1828 msgid "Last print" msgstr "Ost. wydruk" # -#: ultralcd.cpp:1976 +#: ultralcd.cpp:1845 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:2861 +#: ultralcd.cpp:2967 msgid "Left" msgstr "Lewa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:76 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3099 +#: ultralcd.cpp:3215 msgid "Left side [um]" msgstr "Lewo [um]" @@ -913,7 +1013,7 @@ msgid "Left:" msgstr "Lewo:" # -#: ultralcd.cpp:5107 +#: ultralcd.cpp:5575 msgid "Lin. correction" msgstr "Korekcja lin." @@ -923,7 +1023,7 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:5575 +#: ultralcd.cpp:6059 msgid "Load all" msgstr "Zalad. wszystkie" @@ -958,12 +1058,12 @@ msgid "Load filament 5" msgstr "Laduj filament 5" # -#: ultralcd.cpp:6079 +#: ultralcd.cpp:6714 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_LOADING_COLOR -#: ultralcd.cpp:2499 +#: ultralcd.cpp:2609 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -973,7 +1073,7 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7120 +#: ultralcd.cpp:7855 msgid "Loose pulley" msgstr "Luzne kolo pasowe" @@ -993,7 +1093,7 @@ msgid "M109 Invalid extruder " msgstr "M109 Nieprawidlowy ekstruder" # MSG_M117_V2_CALIBRATION c=25 r=1 -#: messages.c:53 +#: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" @@ -1012,8 +1112,23 @@ msgstr "M218 Nieprawidlowy ekstruder" msgid "M221 Invalid extruder " msgstr "M221 Nieprawidlowy ekstruder" +# +#: ultralcd.cpp:6957 +msgid "Magnets comp. [On]" +msgstr "Kor. magnesow[wl]" + +# +#: ultralcd.cpp:6960 +msgid "Magnets comp.[N/A]" +msgstr "Kor. magnesow[nd]" + +# +#: ultralcd.cpp:6958 +msgid "Magnets comp.[Off]" +msgstr "Kor. magnesow[wyl]" + # MSG_MAIN -#: messages.c:54 +#: messages.c:56 msgid "Main" msgstr "Menu glowne" @@ -1023,7 +1138,7 @@ msgid "Mark filament 100mm from extruder body. Click when done." msgstr "Zaznacz filament na wysokosci 100 mm od korpusu ekstrudera i potwierdz naciskajac pokretlo." # -#: ultralcd.cpp:2896 +#: ultralcd.cpp:3002 msgid "Measured skew" msgstr "Zmierzony skos" @@ -1033,32 +1148,67 @@ msgid "Measured skew:" msgstr "Zmierzony skos:" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:59 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" +# +#: ultralcd.cpp:6949 +msgid "Mesh [3x3]" +msgstr "Siatka [3x3]" + +# +#: ultralcd.cpp:6950 +msgid "Mesh [7x7]" +msgstr "Siatka [7x7]" + # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5658 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:5572 +msgid "Mesh bed leveling" +msgstr "Poziomowanie wg siatki" + +# +#: Marlin_main.cpp:881 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Wykryto firmware MK3 w drukarce MK3S" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Wykryto firmware MK3S w drukarce MK3" + +# +#: ultralcd.cpp:1845 msgid "MMU fails" msgstr "Bledy MMU" # -#: mmu.cpp:1399 +#: mmu.cpp:1617 msgid "MMU load failed " msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1977 +#: ultralcd.cpp:1845 msgid "MMU load fails" msgstr "Bledy ladow. MMU" # -#: mmu.cpp:635 +#: ultralcd.cpp:5204 +msgid "MMU Mode [Normal]" +msgstr "Tryb MMU [Normalny]" + +# +#: ultralcd.cpp:5205 +msgid "MMU Mode[Stealth]" +msgstr "Tryb MMU [Stealth]" + +# +#: mmu.cpp:719 msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." @@ -1068,82 +1218,102 @@ msgid "MMU needs user attention. Fix the issue and then press button on MMU unit msgstr "MMU wymaga uwagi. Napraw usterke i wcisnij przycisk na korpusie MMU." # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:676 +#: mmu.cpp:762 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Wznawianie pozycji." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:669 +#: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:687 +#: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "MMU power fails" msgstr "Zaniki zasil. MMU" # -#: ultralcd.cpp:2241 +#: ultralcd.cpp:2112 msgid "MMU2 connected" msgstr "MMU podlaczone" # MSG_STEALTH_MODE_OFF -#: messages.c:84 +#: messages.c:90 msgid "Mode [Normal]" msgstr "Tryb [normalny]" # MSG_SILENT_MODE_ON -#: messages.c:83 +#: messages.c:89 msgid "Mode [silent]" msgstr "Tryb [cichy]" # MSG_STEALTH_MODE_ON -#: messages.c:85 +#: messages.c:91 msgid "Mode [Stealth]" msgstr "Tryb [Stealth]" +# +#: ultralcd.cpp:4424 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" msgstr "Tryb [automatycz]" # MSG_SILENT_MODE_OFF -#: messages.c:82 +#: messages.c:88 msgid "Mode [high power]" msgstr "Tryb[wysoka wyd.]" +# +#: ultralcd.cpp:5404 +msgid "Model [none]" +msgstr "Model [brak]" + +# +#: ultralcd.cpp:5407 +msgid "Model [warn]" +msgstr "Model [ostrzez.]" + +# +#: ultralcd.cpp:5410 +msgid "Model [strict]" +msgstr "Model [restrykc.]" + # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:83 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5091 +#: ultralcd.cpp:5550 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4164 +#: ultralcd.cpp:4291 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4165 +#: ultralcd.cpp:4292 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4166 +#: ultralcd.cpp:4293 msgid "Move Z" msgstr "Ruch osi Z" # -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2973 msgid "N/A" msgstr "N/D" @@ -1153,7 +1323,7 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" # MSG_NO -#: messages.c:58 +#: messages.c:62 msgid "No" msgstr "Nie" @@ -1168,12 +1338,12 @@ msgid "No Checksum with line number, Last Line: " msgstr "Brak sumy kontrolnej z numerem linii, ostatnia linia:" # MSG_NO_MOVE -#: Marlin_main.cpp:4908 +#: Marlin_main.cpp:5254 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6059 +#: ultralcd.cpp:6694 msgid "No SD card" msgstr "Brak karty SD" @@ -1183,37 +1353,67 @@ msgid "No thermistors - no temperature" msgstr "Brak termistorow - brak odczytu temperatury" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7068 +#: ultralcd.cpp:7803 msgid "Not connected" msgstr "Nie podlaczono " # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:79 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4821 +#: ultralcd.cpp:4961 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 -#: ultralcd.cpp:4765 +#: ultralcd.cpp:4905 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # -#: ultralcd.cpp:4756 +#: ultralcd.cpp:4896 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:63 msgid "Nozzle" msgstr "Dysza" # -#: ultralcd.cpp:1919 +#: ultralcd.cpp:5319 +msgid "Nozzle [none]" +msgstr "Dysza [brak]" + +# +#: ultralcd.cpp:5322 +msgid "Nozzle [warn]" +msgstr "Dysza [ostrzez.]" + +# +#: ultralcd.cpp:5325 +msgid "Nozzle [strict]" +msgstr "Dysza [restrykc.]" + +# +#: ultralcd.cpp:5365 +msgid "Nozzle d. [0.25]" +msgstr "Sr. dyszy [0,25]" + +# +#: ultralcd.cpp:5368 +msgid "Nozzle d. [0.40]" +msgstr "Sr. dyszy [0,40]" + +# +#: ultralcd.cpp:5371 +msgid "Nozzle d. [0.60]" +msgstr "Sr. dyszy [0,60]" + +# +#: ultralcd.cpp:1787 msgid "Nozzle FAN" msgstr "Went. hotendu" @@ -1238,7 +1438,7 @@ msgid "ok" msgstr "ok" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1516 +#: Marlin_main.cpp:1535 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." @@ -1258,7 +1458,7 @@ msgid "openRoot failed" msgstr "niepowodzenie openRoot " # MSG_PAUSE_PRINT -#: ultralcd.cpp:6029 +#: ultralcd.cpp:6657 msgid "Pause print" msgstr "Wstrzymanie wydruku" @@ -1268,42 +1468,47 @@ msgid "Pick print" msgstr "Wybierz wydruk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1741 +#: ultralcd.cpp:1613 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1747 +#: ultralcd.cpp:1619 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5198 +#: ultralcd.cpp:5664 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:808 +#: ultralcd.cpp:862 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" +# +#: ultralcd.cpp:3939 +msgid "PINDA:" +msgstr "PINDA:" + # MSG_PAPER c=20 r=8 -#: messages.c:60 +#: messages.c:64 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 "Umiesc kartke papieru na stole roboczym i podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7060 +#: ultralcd.cpp:7795 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:94 +#: messages.c:100 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4830 +#: ultralcd.cpp:4970 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -1313,12 +1518,12 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4664 +#: ultralcd.cpp:4804 msgid "Please insert PLA filament to the extruder, then press knob to load it." msgstr "Umiesc filament PLA w ekstruderze i nacisnij pokretlo, aby zaladowac." # -#: ultralcd.cpp:4660 +#: ultralcd.cpp:4800 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "Wsun filament PLA do pierwszej rurki MMU i nacisnij pokretlo aby go zaladowac." @@ -1328,52 +1533,52 @@ msgid "Please load PLA filament and then resume Wizard by rebooting the printer. msgstr "Zaladuj filament PLA i przywroc Asystenta przez restart drukarki." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4706 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3025 +#: Marlin_main.cpp:3083 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:65 msgid "Please place steel sheet on heatbed." msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:68 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:70 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1347 +#: mmu.cpp:1441 msgid "Please remove filament and then press the knob." msgstr "Wyciagnij filament i wcisnij pokretlo." # -#: ultralcd.cpp:4755 +#: ultralcd.cpp:4895 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:74 msgid "Please remove steel sheet from heatbed." msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4052 +#: Marlin_main.cpp:4317 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1293 +#: mmu.cpp:1360 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosze zaktualizowac Firmware MMU2. Czekam na reset." @@ -1383,12 +1588,12 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:66 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:2013 +#: ultralcd.cpp:1881 msgid "Power failures" msgstr "Zaniki zasilania" @@ -1398,27 +1603,37 @@ msgid "PowerUp" msgstr "Uruchamianie" # MSG_PREHEAT -#: ultralcd.cpp:6018 +#: ultralcd.cpp:6644 msgid "Preheat" msgstr "Grzanie" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:67 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:96 +#: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." # -#: ultralcd.cpp:2350 +#: ultralcd.cpp:2290 +msgid "Preheating to cut" +msgstr "Nagrzewanie do obciecia" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Nagrzewanie do wysuniecia" + +# +#: ultralcd.cpp:2280 msgid "Preheating to load" msgstr "Nagrzew. do ladowania" # -#: ultralcd.cpp:2351 +#: ultralcd.cpp:2284 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." @@ -1428,27 +1643,27 @@ msgid "Prepare new filament" msgstr "Przygotuj filament" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:9150 +#: Marlin_main.cpp:10312 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:2313 +#: ultralcd.cpp:2210 msgid "Press the knob" msgstr "Wcisnij pokretlo" # -#: mmu.cpp:639 +#: mmu.cpp:723 msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:69 msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:1921 +#: ultralcd.cpp:1789 msgid "Print FAN" msgstr "Went. wydruku" @@ -1458,7 +1673,7 @@ msgid "Print FAN: " msgstr "Went. wydr:" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:7471 +#: ultralcd.cpp:8221 msgid "Print fan:" msgstr "Went. wydruku:" @@ -1468,12 +1683,12 @@ msgid "Print from SD" msgstr "Druk z karty SD" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1022 +#: ultralcd.cpp:1080 msgid "Print paused" msgstr "Druk wstrzymany" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2727 +#: ultralcd.cpp:2838 msgid "Print time" msgstr "Czas druku" @@ -1487,6 +1702,26 @@ msgstr "Czas druku: " msgid "Printer disconnected" msgstr "Drukarka rozlaczona" +# +#: util.cpp:473 +msgid "Printer FW version differs from the G-code. Continue?" +msgstr "Wersja FW drukarki rozni sie w G-code. Kontynuowac?" + +# +#: util.cpp:480 +msgid "Printer FW version differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "FW drukarki rozni sie od tego w G-code. Sprawdz ustawienia. Druk anulowany." + +# +#: util.cpp:506 +msgid "Printer G-code level differs from the G-code. Continue?" +msgstr "Poziom G-code drukarki rozni sie od pliku G-code. Kontynuowac?" + +# +#: util.cpp:513 +msgid "Printer G-code level differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Poziom G-code drukarki rozni sie od pliku G-code. Sprawdz ustawienia. Druk anulowany" + # MSG_ERR_KILLED #: Marlin_main.cpp:7547 msgid "Printer halted. kill() called!" @@ -1497,6 +1732,26 @@ msgstr "Drukarka zatrzymana. Wywolano komende kill()!" msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +# +#: util.cpp:423 +msgid "Printer model differs from the G-code. Continue?" +msgstr "Model drukarki rozni sie od tego w G-code. Kontynuowac?" + +# +#: util.cpp:430 +msgid "Printer model differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Model drukarki rozni sie od tego w G-code. Sprawdz ustawienia. Druk anulowany." + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +#: util.cpp:397 +msgid "Printer 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." + # MSG_ERR_STOPPED #: messages.c:32 msgid "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -1512,6 +1767,11 @@ msgstr "Prusa i3 MK2 gotowa" msgid "Prusa i3 MK2.5 ready." msgstr "Prusa i3 MK2.5 gotowa" +# +#: +msgid "Prusa i3 MK3 OK." +msgstr "Prusa i3 MK3 OK" + # WELCOME_MSG c=20 #: msgid "Prusa i3 MK3 ready." @@ -1523,17 +1783,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK" # MSG_PRUSA3D -#: ultralcd.cpp:2227 +#: ultralcd.cpp:2098 msgid "prusa3d.com" msgstr "prusa3d.com" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3102 +#: ultralcd.cpp:3218 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:8575 +#: Marlin_main.cpp:9712 msgid "Recovering print " msgstr "Wznawianie wydruku" @@ -1543,10 +1803,15 @@ msgid "Refresh" msgstr "Odswiez" # MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: mmu.cpp:744 +#: mmu.cpp:830 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." +# +#: ultralcd.cpp:6605 +msgid "Rename" +msgstr "Zmien nazwe" + # MSG_M119_REPORT #: Marlin_main.cpp:5297 msgid "Reporting endstop status" @@ -1563,32 +1828,32 @@ msgid "Resend: " msgstr "Wyslij ponownie:" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3103 +#: ultralcd.cpp:3219 msgid "Reset" msgstr "Reset" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5203 +#: ultralcd.cpp:5669 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_RESUME_PRINT -#: ultralcd.cpp:6033 +#: ultralcd.cpp:6664 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 r=1 -#: messages.c:69 +#: messages.c:73 msgid "Resuming print" msgstr "Wznawianie druku" # -#: ultralcd.cpp:2862 +#: ultralcd.cpp:2968 msgid "Right" msgstr "Prawa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3100 +#: ultralcd.cpp:3216 msgid "Right side[um]" msgstr "Prawo [um]" @@ -1603,22 +1868,22 @@ msgid "Rotate knob until mark reaches extruder body. Click when done." msgstr "Obracaj pokretlo az znacznik zrowna sie z korpusem ekstrudera i potwierdz naciskajac pokretlo." # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5119 +#: ultralcd.cpp:5587 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5117 +#: ultralcd.cpp:5585 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4583 +#: ultralcd.cpp:4723 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 -#: ultralcd.cpp:5033 +#: ultralcd.cpp:5220 msgid "SD card [normal]" msgstr "Karta SD [normal]" @@ -1633,7 +1898,7 @@ msgid "SD card [FlshAir]" msgstr "Karta SD [FlashAir]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5218 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" @@ -1652,53 +1917,63 @@ msgstr "SD printing byte " msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" +# +#: ultralcd.cpp:6601 +msgid "Select" +msgstr "Wybierz" + # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5126 +#: ultralcd.cpp:5594 msgid "Select language" msgstr "Wybor jezyka" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4943 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: ultralcd.cpp:4552 +#: ultralcd.cpp:4692 msgid "Select PLA filament:" msgstr "Wybierz filament PLA:" # MSG_SELFTEST_OK -#: ultralcd.cpp:6631 +#: ultralcd.cpp:7366 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:6449 +#: ultralcd.cpp:7152 msgid "Self test start " msgstr "Rozpoczynanie Selftestu" # MSG_SELFTEST -#: ultralcd.cpp:5179 +#: ultralcd.cpp:5645 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7058 +#: ultralcd.cpp:7793 msgid "Selftest error !" msgstr "Blad selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:77 msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1548 +#: Marlin_main.cpp:1567 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:3819 +#: ultralcd.cpp:2138 +msgid "Sensor info" +msgstr "Info o sensorach" + +# +#: ultralcd.cpp:3938 msgid "Sensor state" msgstr "Stan czujnikow" @@ -1708,17 +1983,17 @@ msgid "Sensors info" msgstr "Info o czujnikach" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3111 +#: ultralcd.cpp:3227 msgid "Set temperature:" msgstr "Ustaw. temperatury:" # MSG_SETTINGS -#: messages.c:81 +#: messages.c:86 msgid "Settings" msgstr "Ustawienia" # -#: ultralcd.cpp:2899 +#: ultralcd.cpp:3005 msgid "Severe skew" msgstr "Znaczny skos" @@ -1727,8 +2002,13 @@ msgstr "Znaczny skos" msgid "Severe skew:" msgstr "Powazny skos:" +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plyta" + # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5200 +#: ultralcd.cpp:5666 msgid "Show end stops" msgstr "Pokaz krancowki" @@ -1743,7 +2023,7 @@ msgid "Sleep..." msgstr "Czuwanie..." # -#: ultralcd.cpp:2898 +#: ultralcd.cpp:3004 msgid "Slight skew" msgstr "Lekki skos" @@ -1753,15 +2033,30 @@ msgid "Slight skew:" msgstr "Lekki skos:" # MSG_FILE_CNT c=20 r=4 -#: cardreader.cpp:738 +#: cardreader.cpp:739 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." # -#: Marlin_main.cpp:4560 +#: Marlin_main.cpp:4833 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z ..." +# MSG_SORT_NONE c=17 r=1 +#: ultralcd.cpp:5230 +msgid "Sort [none]" +msgstr "Sortowanie [brak]" + +# MSG_SORT_TIME c=17 r=1 +#: ultralcd.cpp:5228 +msgid "Sort [time]" +msgstr "Sortowanie [czas]" + +# MSG_SORT_ALPHA c=17 r=1 +#: ultralcd.cpp:5229 +msgid "Sort [alphabet]" +msgstr "Sort. [alfabet]" + # MSG_SORT_NONE c=17 r=1 #: ultralcd.cpp:4250 msgid "Sort: [None]" @@ -1803,117 +2098,132 @@ msgid "Sort: [time]" msgstr "Sortuj: [czas]" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 -#: sound.h:5 +#: sound.h:6 msgid "Sound [loud]" msgstr "Dzwiek [Glosny]" # MSG_SOUND_MUTE c=17 r=1 -#: sound.h:8 +#: msgid "Sound [mute]" msgstr "Dzwiek[Wylaczony]" # MSG_SOUND_ONCE c=17 r=1 -#: sound.h:6 +#: sound.h:7 msgid "Sound [once]" msgstr "Dzwiek [1-raz]" +# +#: +msgid "Sound [assist]" +msgstr "Dzwiek [asyst.]" + +# +#: sound.h:9 +msgid "Sound [blind]" +msgstr "Dzwiek[niewidomy]" + # MSG_SOUND_SILENT c=17 r=1 -#: sound.h:7 +#: sound.h:8 msgid "Sound [silent]" msgstr "Dzwiek [Cichy]" # MSG_SPEED -#: ultralcd.cpp:6199 +#: ultralcd.cpp:6840 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:80 msgid "Spinning" msgstr "Kreci sie" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5098 msgid "SpoolJoin [on]" msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:5094 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [nd]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4963 +#: ultralcd.cpp:5102 msgid "SpoolJoin [off]" msgstr "SpoolJoin [wyl]" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4065 +#: Marlin_main.cpp:4330 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." # MSG_STATISTICS -#: ultralcd.cpp:6108 +#: ultralcd.cpp:6753 msgid "Statistics " msgstr "Statystyki" +# +#: ultralcd.cpp:5551 +msgid "Steel sheets" +msgstr "Plyty stalowe" + # MSG_STEPPER_TOO_HIGH #: stepper.cpp:345 msgid "Steprate too high: " msgstr "Liczba krokow zbyt wysoka:" # MSG_STOP_PRINT -#: messages.c:87 +#: messages.c:93 msgid "Stop print" -msgstr "Zatrzymac druk" +msgstr "Przerwanie druku" # MSG_STOPPED -#: messages.c:88 +#: messages.c:94 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6117 +#: ultralcd.cpp:6762 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7138 +#: ultralcd.cpp:7873 msgid "Swapped" msgstr "Zamieniono" # MSG_TEMP_CALIBRATION c=20 r=1 -#: messages.c:89 +#: messages.c:95 msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5113 +#: ultralcd.cpp:5581 msgid "Temp. cal. [on]" msgstr "Kalibr. temp.[wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5111 +#: ultralcd.cpp:5579 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5209 +#: ultralcd.cpp:5675 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5089 +#: ultralcd.cpp:5548 msgid "Temperature" msgstr "Temperatura" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3744 +#: ultralcd.cpp:3864 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" @@ -1923,12 +2233,12 @@ msgid "Temperature calibration has not been run yet" msgstr "Kalibracja temperaturowa nie zostala jeszcze przeprowadzona" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:90 +#: messages.c:96 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2273 +#: ultralcd.cpp:2144 msgid "Temperatures" msgstr "Temperatury" @@ -1938,27 +2248,27 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2316 +#: ultralcd.cpp:2217 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2317 +#: ultralcd.cpp:2221 msgid "to unload filament" msgstr "aby rozlad. filament" # -#: ultralcd.cpp:1961 +#: ultralcd.cpp:1829 msgid "Total" msgstr "Suma" # -#: ultralcd.cpp:1994 +#: ultralcd.cpp:1862 msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2752 +#: ultralcd.cpp:2860 msgid "Total filament" msgstr "Calkowita dlugosc filamentu" @@ -1968,7 +2278,7 @@ msgid "Total filament :" msgstr "Filament lacznie :" # -#: ultralcd.cpp:2754 +#: ultralcd.cpp:2860 msgid "Total print time" msgstr "Calkowity czas druku" @@ -1983,17 +2293,17 @@ msgid "TRIGGERED" msgstr "AKTYWOWANO" # MSG_TUNE -#: ultralcd.cpp:6015 +#: ultralcd.cpp:6641 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:2249 +#: ultralcd.cpp:2120 msgid "unknown" msgstr "nieznane" # -#: ultralcd.cpp:4640 +#: ultralcd.cpp:4780 msgid "Unload" msgstr "Rozladuj" @@ -2003,7 +2313,7 @@ msgid "Unload all" msgstr "Rozladuj wszystkie" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:91 +#: messages.c:97 msgid "Unload filament" msgstr "Rozladowanie fil." @@ -2028,22 +2338,22 @@ msgid "Unload filament 4" msgstr "Rozladuj fil. 4" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:92 +#: messages.c:98 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:4639 +#: ultralcd.cpp:4779 msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." msgstr "Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku." # MSG_USED c=19 r=1 -#: ultralcd.cpp:5334 +#: ultralcd.cpp:5803 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2147 msgid "Voltages" msgstr "Napiecia" @@ -2053,32 +2363,37 @@ msgid "volume.init failed" msgstr "niepowodzenie volume.init " # MSG_USERWAIT -#: Marlin_main.cpp:4876 +#: Marlin_main.cpp:5225 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3255 +#: ultralcd.cpp:3371 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3335 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\nCrash detection\ndisabled in\nStealth mode" +msgstr "UWAGA:\nWykrywanie zderzen\nwylaczone\nw trybie Stealth" + # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1508 +#: Marlin_main.cpp:1527 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 -#: Marlin_main.cpp:1500 +#: Marlin_main.cpp:1519 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1504 +#: Marlin_main.cpp:1523 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" @@ -2088,17 +2403,17 @@ msgid "WARNING: This is an unofficial, unsupported build. Use at your own risk!" msgstr "OSTRZEZENIE: To jest nieoficjalna, niewspierana wersja firmware. Uzywasz na wlasna odpowiedzialnosc!" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3014 +#: Marlin_main.cpp:3072 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:80 +#: messages.c:85 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5176 +#: ultralcd.cpp:5642 msgid "Wizard" msgstr "Asystent" @@ -2117,23 +2432,28 @@ msgstr "Zapis do pliku:" msgid "X-correct" msgstr "Korekcja X" +# +#: ultralcd.cpp:5028 +msgid "X-correct:" +msgstr "Korekcja-X:" + # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2265 +#: ultralcd.cpp:2136 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3715 +#: ultralcd.cpp:3835 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 -#: ultralcd.cpp:3712 +#: ultralcd.cpp:3832 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 -#: ultralcd.cpp:3693 +#: ultralcd.cpp:3813 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." @@ -2143,17 +2463,17 @@ msgid "XYZ calibration compromised. Left front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Lewy przedni punkt nieosiagalny." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3696 +#: ultralcd.cpp:3816 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # -#: ultralcd.cpp:3675 +#: ultralcd.cpp:3795 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3681 +#: ultralcd.cpp:3801 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." @@ -2168,17 +2488,17 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # -#: ultralcd.cpp:3684 +#: ultralcd.cpp:3804 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 -#: ultralcd.cpp:3709 +#: ultralcd.cpp:3829 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" # -#: ultralcd.cpp:2859 +#: ultralcd.cpp:2965 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" @@ -2192,8 +2512,13 @@ msgstr "Min. odleglosc od Y:" msgid "Y-correct" msgstr "Korekcja Y" +# +#: ultralcd.cpp:5029 +msgid "Y-correct:" +msgstr "Korekcja-Y:" + # MSG_YES -#: messages.c:98 +#: messages.c:104 msgid "Yes" msgstr "Tak" @@ -2208,11 +2533,26 @@ msgid "You are using firmware beta version. This is development version. Using t msgstr "Uzywasz firmware w wersji beta. Ta wersja jest rozwojowa. Uzywanie jej nie jest zalecane i moze spowodowac uszkodzenie drukarki." # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:97 +#: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +# +#: ultralcd.cpp:5030 +msgid "Z-correct:" +msgstr "Korekcja-Z:" + +# +#: ultralcd.cpp:6952 +msgid "Z-probe nr. [1]" +msgstr "Pomiar-Z [1]" + +# +#: ultralcd.cpp:6954 +msgid "Z-probe nr. [3]" +msgstr "Pomiar-Z [3]" + # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2914 +#: ultralcd.cpp:3024 msgid "[0;0] point offset" msgstr "[0;0] przesuniecie punktu" From 3ba2197dd3dc14d3489bf910d4a32e68c8e75a58 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 08:37:59 +0200 Subject: [PATCH 083/104] more space for the second lang --- Firmware/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index a712839b..57d7f662 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -49,7 +49,7 @@ //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (10240 bytes) +#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (10240 bytes) #endif //_CONFIG_H From d182e6fc65650f8fadde574274f2c937e06bc9b7 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 15:35:21 +0200 Subject: [PATCH 084/104] DE,ES,FR translation finetuning --- lang/lang_en_de.txt | 10 +++++----- lang/lang_en_es.txt | 8 ++++---- lang/lang_en_fr.txt | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 70ca591c..08a114d8 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -28,7 +28,7 @@ #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " -"Alles richtig " +"Alles richtig " #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Duesen Luefter" +"Duesevent." #MSG_PAUSE_PRINT "Pause print" @@ -1052,11 +1052,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Temp. Kal. [AN]" +"Temp. Kal. [an]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Temp. Kal. [AUS]" +"Temp. Kal. [aus]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1417,7 +1417,7 @@ # "Sound [assist]" -"\x00" +"Sound [Assist]" # "Steel sheets" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index b624457e..7b5bff84 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -104,7 +104,7 @@ #MSG_BED "Bed" -"Base calefactable " +"Base" #MSG_MENU_BELT_STATUS c=15 r=1 "Belt status" @@ -648,7 +648,7 @@ # "N/A" -"No disponible" +"N/A" #MSG_NO "No" @@ -1256,7 +1256,7 @@ # "FINDA:" -"\x00" +"FINDA:" # "Firmware [none]" @@ -1380,7 +1380,7 @@ # "PINDA:" -"\x00" +"PINDA:" # "Preheating to cut" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 243a50e5..82da96f9 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Ventilateur buse" +"Vent. buse" #MSG_PAUSE_PRINT "Pause print" @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventilo impr. :" +"Vent.impr:" #MSG_CARD_MENU "Print from SD" From da0c4a2fa8dd5f9984abbd2d0f00b7fe7c02d37c Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 15:51:51 +0200 Subject: [PATCH 085/104] lang translation finetuning 2 --- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 08a114d8..3b771a21 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -980,7 +980,7 @@ # "Severe skew" -"Schwerer Schraeglauf" +"Schwer.Schr" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -996,7 +996,7 @@ # "Slight skew" -"Leichter Schraeglauf" +"Leicht.Schr" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 7b5bff84..77f3819b 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -256,7 +256,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Ventilador del extrusor:" +"Vent.extrusor:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Ventilador de capa" +"Vent. capa" #MSG_PAUSE_PRINT "Pause print" @@ -980,7 +980,7 @@ # "Severe skew" -"Inclinacion severa" +"Incl.severa" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -996,7 +996,7 @@ # "Slight skew" -"Ligeramente inclinado" +"Liger.incl." #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" From d408fd2f42074bc02f3a7a4d2f179f05ce069367 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 6 Sep 2019 15:54:04 +0200 Subject: [PATCH 086/104] Update reserved space bytes as mentioned in https://github.com/prusa3d/Prusa-Firmware/pull/2170#pullrequestreview-284810840 --- Firmware/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index 57d7f662..0473c3ff 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -49,7 +49,7 @@ //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (10240 bytes) +#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (12288 bytes) #endif //_CONFIG_H From e8d8e0c9f055fe548b43d5d57a98928bf326af6d Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 15:58:26 +0200 Subject: [PATCH 087/104] lang translation finetuning 3 --- lang/lang_en_es.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 77f3819b..41d6fc3b 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventilador del fusor:" +"Vent.fusor:" #MSG_CARD_MENU "Print from SD" @@ -844,7 +844,7 @@ # "Print FAN" -"Ventilador del extrusor" +"Vent.extr" #MSG_PRUSA3D "prusa3d.com" From 3d8b5129da74178e72506c9397a138ed97257717 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 16:04:00 +0200 Subject: [PATCH 088/104] lang translation finetuning 4 --- lang/lang_en_de.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3b771a21..a426c13a 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -844,7 +844,7 @@ # "Print FAN" -"Druckluefter" +"Druckvent" #MSG_PRUSA3D "prusa3d.com" From 61c6e6d2573f26ed98988d1eb146d92d5b02b9ae Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 16:47:55 +0200 Subject: [PATCH 089/104] lang translation finetuning 5 --- lang/lang_en_es.txt | 6 +++--- lang/lang_en_fr.txt | 36 ++++++++++++++++++------------------ lang/lang_en_it.txt | 26 +++++++++++++------------- lang/lang_en_pl.txt | 14 +++++++------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 41d6fc3b..dd4db925 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -568,7 +568,7 @@ # "Measured skew" -"Desviacion medida:" +"Desviacion med:" # "MMU fails" @@ -1052,11 +1052,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Cal. temp. [ON]" +"Cal. temp. [on]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Cal. temp. [OFF]" +"Cal. temp. [off]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 82da96f9..5c4f7e9d 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -172,15 +172,15 @@ #MSG_CRASHDETECT_ON "Crash det. [on]" -"Detect. crash[on]" +"Detect.crash [on]" #MSG_CRASHDETECT_NA "Crash det. [N/A]" -"Detect. crash [N/A]" +"Detect.crash[N/A]" #MSG_CRASHDETECT_OFF "Crash det. [off]" -"Detect. crash[off]" +"Detect.crash[off]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -288,7 +288,7 @@ #MSG_FAN_SPEED c=14 "Fan speed" -"Vitesse ventil" +"Vitesse vent." #MSG_SELFTEST_FAN c=20 "Fan test" @@ -604,7 +604,7 @@ #MSG_STEALTH_MODE_ON "Mode [Stealth]" -"Mode [Furtif]" +"Mode [Furtif]" #MSG_AUTO_MODE_ON "Mode [auto power]" @@ -612,7 +612,7 @@ #MSG_SILENT_MODE_OFF "Mode [high power]" -"Mode [haute puiss]" +"Mode[haute puiss]" # "MMU2 connected" @@ -804,7 +804,7 @@ # "Power failures" -"Coupures de courant" +"Coup.de courant" #MSG_PRINT_ABORTED c=20 "Print aborted" @@ -844,7 +844,7 @@ # "Print FAN" -"Ventilo impression" +"Vent.impr" #MSG_PRUSA3D "prusa3d.com" @@ -868,7 +868,7 @@ #MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -"Reinit. calibr. XYZ" +"Reinit.calibr. XYZ" #MSG_BED_CORRECTION_RESET "Reset" @@ -888,11 +888,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"Port RPi [on]" +"Port RPi [on]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"Port RPi [off]" +"Port RPi [off]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -904,7 +904,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [flshAir]" -"Carte SD [flashAir]" +"CarteSD[flashAir]" # "Right" @@ -980,7 +980,7 @@ # "Severe skew" -"Deviation severe" +"Deviat.sev." #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -992,15 +992,15 @@ #MSG_SOUND_LOUD c=17 r=1 "Sound [loud]" -"Son [fort]" +"Son [fort]" # "Slight skew" -"Deviation legere" +"Deviat.leg." #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" -"Son [muet]" +"Son [muet]" # "Some problem encountered, Z-leveling enforced ..." @@ -1008,11 +1008,11 @@ #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" -"Son [une fois]" +"Son [une fois]" #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -"Son [silencieux]" +"Son [silencieux]" #MSG_SPEED "Speed" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index f18114e9..0ee9dbec 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -256,7 +256,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Ventola estrusore:" +"Ventola estr:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -268,7 +268,7 @@ # "Fail stats MMU" -"Statistiche fallimenti MMU" +"Stat.fall. MMU" #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" @@ -284,11 +284,11 @@ # "Fail stats" -"Statistiche fallimenti" +"Stat. fallimenti" #MSG_FAN_SPEED c=14 "Fan speed" -"Velocita ventola" +"Velocita vent." #MSG_SELFTEST_FAN c=20 "Fan test" @@ -304,7 +304,7 @@ #MSG_FSENSOR_ON "Fil. sensor [on]" -"Sensor filam.[On]" +"Sensor filam.[on]" #MSG_FSENSOR_NA "Fil. sensor [N/A]" @@ -568,7 +568,7 @@ # "Measured skew" -"Deviazione misurata" +"Deviazione mis" # "MMU fails" @@ -600,7 +600,7 @@ # "MMU power fails" -"Mancanza corrente MMU" +"Manc. corr. MMU" #MSG_STEALTH_MODE_ON "Mode [Stealth]" @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Ventola di stampa:" +"Vent.stam:" #MSG_CARD_MENU "Print from SD" @@ -980,7 +980,7 @@ # "Severe skew" -"Deviazione grave" +"Devia.grave" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -996,7 +996,7 @@ # "Slight skew" -"Deviazione lieve" +"Devia.lieve" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" @@ -1052,11 +1052,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Calib. temp. [ON]" +"Calib. temp. [on]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Calib. temp.[OFF]" +"Calib. temp.[off]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1088,7 +1088,7 @@ # "Total print time" -"Tempo di stampa totale" +"Tempo stampa totale" #MSG_TUNE "Tune" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 65e01651..602775ff 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -8,7 +8,7 @@ #MSG_MEASURED_OFFSET "[0;0] point offset" -"[0;0] przesuniecie punktu" +"[0;0] przesun.punktu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "Crash detection can\x0abe turned on only in\x0aNormal mode" @@ -256,7 +256,7 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Went. ekstrudera:" +"Went. ekstr:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Went. hotendu" +"Went. Hotend" #MSG_PAUSE_PRINT "Pause print" @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Went. wydruku:" +"Went.wydr:" #MSG_CARD_MENU "Print from SD" @@ -844,7 +844,7 @@ # "Print FAN" -"Went. wydruku" +"Went.wydr" #MSG_PRUSA3D "prusa3d.com" @@ -980,7 +980,7 @@ # "Severe skew" -"Znaczny skos" +"ZnacznySkos" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -1052,7 +1052,7 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Kalibr. temp.[wl]" +"Kalibr.temp. [wl]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" From 0413fe9e0eaa4c62daa0cca1de7fa8f338f0670c Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 17:12:19 +0200 Subject: [PATCH 090/104] lang translation finetuning 6 --- lang/lang_en_cz.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 4b6f9b17..659a9372 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Trysk. vent." +"Tryska V." #MSG_PAUSE_PRINT "Pause print" @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Tiskovy vent.:" +"Tiskovy v:" #MSG_CARD_MENU "Print from SD" @@ -844,7 +844,7 @@ # "Print FAN" -"Tiskovy vent." +"Tiskovy v" #MSG_PRUSA3D "prusa3d.com" From eec8e5f8c0e90485f894b804a783e95a9ee43486 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 6 Sep 2019 19:47:05 +0200 Subject: [PATCH 091/104] Version changed (3.8.0 build 2684) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index ebda4960..04e7e85d 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -16,8 +16,8 @@ extern uint16_t nPrinterType; extern PGM_P sPrinterName; // Firmware version -#define FW_VERSION "3.8.0-RC2" -#define FW_COMMIT_NR 2639 +#define FW_VERSION "3.8.0" +#define FW_COMMIT_NR 2684 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN From 28c1486df293a091c3a4d947f212adcd29ea531a Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:14:10 +0200 Subject: [PATCH 092/104] Update Configuration.h --- Firmware/Configuration.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7a782d71..7f257711 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -291,6 +291,8 @@ your extruder heater takes 2 minutes to hit the target on heating. #define Z_HEIGHT_HIDE_LIVE_ADJUST_MENU 2.0f +#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in calibration + //============================= Bed Auto Leveling =========================== //#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) From 978ace7fd7b91d5aafbfd64952b23cb8827cd3ea Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:16:06 +0200 Subject: [PATCH 093/104] Update Marlin_main.cpp --- 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 ea1eb66d..b9ea4371 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2876,7 +2876,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) #endif //TMC2130 enable_endstops(endstops_enabled); - if ((st_get_position_mm(Z_AXIS) <= (MESH_HOME_Z_SEARCH + HOME_Z_SEARCH_THRESHOLD)) || + if ((st_get_position_mm(Z_AXIS) <= (MESH_HOME_Z_SEARCH + HOME_Z_SEARCH_THRESHOLD)) && (st_get_position_mm(Z_AXIS) >= (MESH_HOME_Z_SEARCH - HOME_Z_SEARCH_THRESHOLD))) { if (onlyZ) From a9a3d9d084fd019e172f3b7b3cdc3e6a60f99e40 Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:17:00 +0200 Subject: [PATCH 094/104] Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 05657f05..e6c30976 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -257,8 +257,7 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind From ca6937edaf734e29376b290b5cb1ef2126d0a207 Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:17:42 +0200 Subject: [PATCH 095/104] Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 887ef97a..bc1f2fa1 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -256,8 +256,7 @@ BED SETTINGS #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind From e581263bf10fe1dd3d8b833ad44ae5234be5d87b Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:18:22 +0200 Subject: [PATCH 096/104] Update 1_75mm_MK25-RAMBo10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 5bdf3ac9..4e3a43f5 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -314,8 +314,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 0b50b2295cf2c304190c4e2b12117aa9a9414a5b Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:18:54 +0200 Subject: [PATCH 097/104] Update 1_75mm_MK25-RAMBo13a-E3Dv6full.h --- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 80285141..c8bc7c2a 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -315,8 +315,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 325e4a34039ce66f87e2ea7adaac4eb3157084c7 Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:19:27 +0200 Subject: [PATCH 098/104] Update 1_75mm_MK25S-RAMBo10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 0c1518ad..62f001bd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -314,8 +314,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From fb561b15ad7cb760c6e87146a283d94f0624112e Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:19:52 +0200 Subject: [PATCH 099/104] Update 1_75mm_MK25S-RAMBo13a-E3Dv6full.h --- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index d783c10f..b1072f93 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -315,8 +315,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 70de4d58f6bf4a9309403c802a0d12ff27b4569c Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:20:14 +0200 Subject: [PATCH 100/104] Update 1_75mm_MK3-EINSy10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 0b96724d..f6e9259a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -422,8 +422,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 7cc9fe2e4fdf501bea70a625be4cf6101ea019ac Mon Sep 17 00:00:00 2001 From: MRprusa3d <38257799+MRprusa3d@users.noreply.github.com> Date: Mon, 9 Sep 2019 02:20:39 +0200 Subject: [PATCH 101/104] Update 1_75mm_MK3S-EINSy10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 1c408db8..027b13ad 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -424,8 +424,7 @@ #define BED_ADJUSTMENT_UM_MAX 100 #define MESH_HOME_Z_CALIB 0.2 -#define MESH_HOME_Z_SEARCH 5.f // Z lift for homing, mesh bed leveling etc. -#define HOME_Z_SEARCH_THRESHOLD 0.15f // Threshold of the Z height in claibration +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right #define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind From 2480bd90fc6dc861aa6f3b51f0e68f35c8190ab9 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 24 Jul 2019 09:55:40 +0300 Subject: [PATCH 102/104] Revert lcd_putchar to type int and retrun 0 Discussion: https://github.com/prusa3d/Prusa-Firmware/pull/2008#issuecomment-514500738 --- Firmware/lcd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index fd3e1328..71948789 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -189,9 +189,10 @@ static void lcd_begin(uint8_t clear) #endif } -static void lcd_putchar(char c, FILE *) +static int lcd_putchar(char c, FILE *) { lcd_write(c); + return 0; } void lcd_init(void) From 818befb91beb3ea70482f92d0acdf693fc43d6d7 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 17 Jul 2019 13:28:54 +0300 Subject: [PATCH 103/104] Fix compile warning function was defined as static in lcd.cpp and redefined in lcd.h --- Firmware/lcd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 307e9486..790c0a95 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -11,7 +11,6 @@ extern FILE _lcdout; #define lcdout (&_lcdout) -extern void lcd_putchar(char c, FILE *stream); extern void lcd_init(void); From e1e40213b211b96ca8e1642e74dd491cb7775097 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 10 Sep 2019 16:49:22 +0200 Subject: [PATCH 104/104] Enable fan pin test even for MK3 (was disabled in 3.7.2 due to lack 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 c39b52e6..607d028b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3262,7 +3262,7 @@ static void gcode_PRUSA_SN() //! May be that's why the bad RAMBo's still produce some fan RPM reading, but not corresponding to reality static void gcode_PRUSA_BadRAMBoFanTest(){ //printf_P(PSTR("Enter fan pin test\n")); -#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 && defined(IR_SENSOR) +#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 fan_measuring = false; // prevent EXTINT7 breaking into the measurement unsigned long tach1max = 0; uint8_t tach1cntr = 0;