From 173062295f9ead60600c5df24419d911e5c3e994 Mon Sep 17 00:00:00 2001 From: Voinea Date: Sat, 6 Apr 2019 12:50:22 +0300 Subject: [PATCH 001/190] Enable print fan while waiting for cooldown --- Firmware/ultralcd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e06824f13e..c9932eadb2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3507,6 +3507,8 @@ void lcd_wait_for_cool_down() { lcd_set_custom_characters_degree(); setAllTargetHotends(0); setTargetBed(0); + int fanSpeedBckp = fanSpeed; + fanSpeed = 255; while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) { lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=3 @@ -3525,6 +3527,7 @@ void lcd_wait_for_cool_down() { delay_keep_alive(1000); serialecho_temperatures(); } + fanSpeed = fanSpeedBckp; lcd_set_custom_characters_arrows(); lcd_update_enable(true); } From 863c7158b2f97c624acde09aa678ed7e06b5eac4 Mon Sep 17 00:00:00 2001 From: Paul Bransford Date: Tue, 16 Apr 2019 06:15:46 -0400 Subject: [PATCH 002/190] use modification times for sdcard sort --- Firmware/cardreader.cpp | 28 ++++++++++++++-------------- Firmware/cardreader.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 7aa8ed7e0e..38c3f9e6f0 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -137,8 +137,8 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m SERIAL_ECHOPGM("Access date: "); MYSERIAL.println(p.lastAccessDate); SERIAL_ECHOLNPGM("");*/ - creationDate = p.creationDate; - creationTime = p.creationTime; + modificationDate = p.lastWriteDate; + modificationTime = p.lastWriteTime; //writeDate = p.lastAccessDate; if (match != NULL) { if (strcasecmp(match, filename) == 0) return; @@ -761,8 +761,8 @@ void CardReader::presort() { #endif #elif SDSORT_USES_STACK char sortnames[fileCnt][LONG_FILENAME_LENGTH]; - uint16_t creation_time[fileCnt]; - uint16_t creation_date[fileCnt]; + uint16_t modification_time[fileCnt]; + uint16_t modification_date[fileCnt]; #endif // Folder sorting needs 1 bit per entry for flags. @@ -782,8 +782,8 @@ void CardReader::presort() { // retaining only two filenames at a time. This is very // slow but is safest and uses minimal RAM. char name1[LONG_FILENAME_LENGTH + 1]; - uint16_t creation_time_bckp; - uint16_t creation_date_bckp; + uint16_t modification_time_bckp; + uint16_t modification_date_bckp; #endif position = 0; @@ -809,8 +809,8 @@ void CardReader::presort() { #else // Copy filenames into the static array strcpy(sortnames[i], LONGEST_FILENAME); - creation_time[i] = creationTime; - creation_date[i] = creationDate; + modification_time[i] = modificationTime; + modification_date[i] = modificationDate; #if SDSORT_CACHE_NAMES strcpy(sortshort[i], filename); #endif @@ -835,12 +835,12 @@ void CardReader::presort() { // Compare names from the array or just the two buffered names #if SDSORT_USES_RAM #define _SORT_CMP_NODIR() (strcasecmp(sortnames[o1], sortnames[o2]) > 0) - #define _SORT_CMP_TIME_NODIR() (((creation_date[o1] == creation_date[o2]) && (creation_time[o1] < creation_time[o2])) || \ - (creation_date[o1] < creation_date [o2])) + #define _SORT_CMP_TIME_NODIR() (((modification_date[o1] == modification_date[o2]) && (modification_time[o1] < modification_time[o2])) || \ + (modification_date[o1] < modification_date [o2])) #else #define _SORT_CMP_NODIR() (strcasecmp(name1, name2) > 0) //true if lowercase(name1) > lowercase(name2) - #define _SORT_CMP_TIME_NODIR() (((creation_date_bckp == creationDate) && (creation_time_bckp > creationTime)) || \ - (creation_date_bckp > creationDate)) + #define _SORT_CMP_TIME_NODIR() (((modification_date_bckp == modificationDate) && (modification_time_bckp > modificationTime)) || \ + (modification_date_bckp > modificationDate)) #endif @@ -891,8 +891,8 @@ void CardReader::presort() { counter++; getfilename_simple(positions[o1]); strcpy(name1, LONGEST_FILENAME); // save (or getfilename below will trounce it) - creation_date_bckp = creationDate; - creation_time_bckp = creationTime; + modification_date_bckp = modificationDate; + modification_time_bckp = modificationTime; #if HAS_FOLDER_SORTING bool dir1 = filenameIsDir; #endif diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index f287a44f4b..9f8385ba41 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -77,7 +77,7 @@ class CardReader bool cardOK ; bool paused ; char filename[13]; - uint16_t creationTime, creationDate; + uint16_t modificationTime, modificationDate; uint32_t cluster, position; char longFilename[LONG_FILENAME_LENGTH]; bool filenameIsDir; @@ -114,8 +114,8 @@ class CardReader #endif #elif !SDSORT_USES_STACK char sortnames[SDSORT_LIMIT][FILENAME_LENGTH]; - uint16_t creation_time[SDSORT_LIMIT]; - uint16_t creation_date[SDSORT_LIMIT]; + uint16_t modification_time[SDSORT_LIMIT]; + uint16_t modification_date[SDSORT_LIMIT]; #endif // Folder sorting uses an isDir array when caching items. From ce25bb8532b3f9262fbfd57c3613ecf782caeee9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 19 Apr 2019 17:24:03 +0200 Subject: [PATCH 003/190] Introduce an editorconfig file --- .editorconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..8acdfc7e96 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +#-*-mode:conf-*- +# editorconfig file (see EditorConfig.org) + +root = true + +[*] +end_of_line = lf +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true +indent_style = space +indent_size = 4 +tab_width = 4 +max_line_length = 100 From 367a28a5a8dd1c7fbc2308f953447194659584e9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 23 Apr 2019 20:24:04 +0200 Subject: [PATCH 004/190] 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 48c408f9ca..3f7c6960b5 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 005/190] 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 3f7c6960b5..169a1f18a9 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 006/190] 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 7f2efe35b5..b5b0ad1ecb 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 007/190] 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 b5b0ad1ecb..bdfb29d237 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 008/190] 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 bdfb29d237..16a1b66bf7 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 49d2866b48648cc4c5b283f47301aef512fa28b2 Mon Sep 17 00:00:00 2001 From: Simon Benoit Date: Tue, 23 Jul 2019 21:20:37 -0400 Subject: [PATCH 009/190] 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 35722679bf..ea1eb66d03 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 442e8b9445..05657f053c 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 44fee01ec0..887ef97ac5 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 a979503ae3..5bdf3ac904 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 bb897fd746..8028514195 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 8425dfd729..0c1518ad5f 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 525c2206f9..d783c10f5d 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 8b843095fc..0b96724d75 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 5f1009a50d..1c408db840 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 cb19f0958b5716f255c0a150b7e67a7673f48c80 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 5 Aug 2019 09:51:06 +0200 Subject: [PATCH 010/190] 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 16a1b66bf7..0df610458e 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 33037d369cf35fb0ea8d962bb9c8d26df9dfd561 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 5 Aug 2019 18:22:56 +0200 Subject: [PATCH 011/190] 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 169a1f18a9..7e96fcc8a8 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 012/190] 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 acdadfe7fa..4cd696978f 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 2ddbd606f2e9a803a0eac396698e14655e9879c9 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 8 Aug 2019 16:44:16 +0200 Subject: [PATCH 013/190] 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 7a782d71c8..870eee89ae 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 014/190] 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 8a913b6387..a3e5444c34 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; - } - --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 ]; + 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; } - ++outer; - inner = innerMax; - } } diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 6b6cbe2cff..e2f696c9d6 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 015/190] 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 ac8a302fd7..d8290a503d 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 016/190] 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 d8290a503d..33a4257e73 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 442e8b9445..2539e82c3b 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 44fee01ec0..fbbc332dac 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 a979503ae3..d0d0341cac 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 bb897fd746..c931b7db0a 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 8425dfd729..c5df948c24 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 525c2206f9..cc2498d632 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 b3828ce539..b2b2661719 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 5f1009a50d..5736b632f5 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 017/190] 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 33a4257e73..4b422a11db 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 018/190] 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 4b422a11db..2bf1d3b483 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 019/190] 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 2bf1d3b483..de56ea028b 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 020/190] 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 de56ea028b..16830f87d2 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 021/190] 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 483d3018b4..64f8ce742d 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7768,7 +7768,7 @@ SERIAL_PROTOCOLPGM("\n\n"); 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 @@ SERIAL_PROTOCOLPGM("\n\n"); #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 d6e533dfb1..2c81a6e836 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 022/190] 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 bfec021fdb..3ab34c41fc 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) +{ + 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_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 + 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 1f338cc51f..a52bef76c0 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 16830f87d2..66bdc764f1 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 411b9178914484da48e1cb4182e33c57ea64e5ca Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 19 Aug 2019 15:06:47 +0200 Subject: [PATCH 023/190] Start of documentation of the translation process --- lang/translations.md | 164 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 lang/translations.md diff --git a/lang/translations.md b/lang/translations.md new file mode 100644 index 0000000000..79fdbfc54a --- /dev/null +++ b/lang/translations.md @@ -0,0 +1,164 @@ +# Translations + +## Workflow + +- Build firmware using build.sh. That creates necessary files in the `lang` dir. +- add messages that are new: investigate not-tran.txt, copy selected strings into `lang_add.txt` and run lang-add.sh +- export PO files for translation: `lang-export.sh` +- when translators finish their work use `lang-import.sh` + +## Files + +### `lang_en.txt` +``` +#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +"Crash detection can\x0abe turned on only in\x0aNormal mode" +``` + +### `lang_en_*.txt` +``` +#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +"Crash detection can\x0abe turned on only in\x0aNormal mode" +"Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" +``` +1. a comment - usually a MSG define with number of characters (c) and rows (r) +2. English text +3. translated text + +### `not_tran.txt` +A simple list of strings that are not translated yet. + +### `not_used.txt` +A list os strings not currently used in the firmware. May be removed from `lang_en_*.txt` files by hand. + +## Scripts + +### `config.sh` +- Checks setup and sets auxiliary env vars used in many other scripts. +- Looks for env var `ARDUINO`. If not found/empty, a default `C:/arduino-1.8.5` is used. +- Sets env var `CONFIG_OK=1` when all good, otherwise sets `CONFIG_OK=0` + +### `fw-build.sh` +Joins firmware HEX and language binaries into one file. + +### `fw-clean.sh` + +### `lang-add.sh` +Adds new messages into the dictionary regardless of whether there have been any older versions. + +### `lang-build.sh` +Generates lang_xx.bin (language binary files) for the whole firmware build. + +Arguments: +- `$1` : language code (`en`, `cz`, `de`, `es`, `fr`, `it`, `pl`) or `all` +- empty/no arguments defaults to `all` + +Input: `lang_en.txt` or `lang_en_xx.txt` + +Output: `lang_xx.bin` + +Temporary files: `lang_xx.tmp` and `lang_xx.dat` + +Description of the process: +The script first runs `lang-check.py $1` and removes empty lines and comments (and non-translated texts) into `lang_$1.tmp`. +The tmp file now contains all translated texts (some of them empty, i.e. ""). +The tmp file is then transformed into `lang_$1.dat`, which is a simple dump of all texts together, each terminated with a `\x00`. +Format of the `bin` file: +- 00-01: `A5 5A` +- 02-03: `B4 4B` +- 04-05: 2B size +- 06-07: 2B number of strings +- 08-09: 2B checksum +- 0A-0B: 2B lang code hex data: basically `en` converted into `ne`, i.e. characters swapped. Only `cz` is changed into `sc` (old `cs` ISO code). +- 0C-0D: 2B signature low +- 0E-0F: 2B signature high +- 10-(10 + 2*number of strings): table of string offsets from the beginning of this file +- after the table there are the strings themselves, each terminated with `\x00` + +The signature is composed of 2B number of strings and 2B checksum in lang_en.bin. Signature in lang_en.bin is zero. + +### `lang-check.sh` and `lang-check.py` +Both do the same, only lang-check.py is newer, i.e. lang-check.sh is not used anymore. +lang-check.py makes a binary comparison between what's in the dictionary and what's in the binary. + +### `lang-clean.sh` +Removes all language output files from lang folder. That means deleting: +- if [ "$1" = "en" ]; then + rm_if_exists lang_$1.tmp + else + rm_if_exists lang_$1.tmp + rm_if_exists lang_en_$1.tmp + rm_if_exists lang_en_$1.dif + rm_if_exists lang_$1.ofs + rm_if_exists lang_$1.txt + fi + rm_if_exists lang_$1_check.dif + rm_if_exists lang_$1.bin + rm_if_exists lang_$1.dat + rm_if_exists lang_$1_1.tmp + rm_if_exists lang_$1_2.tmp + +### `lang-export.sh` +Exports PO (gettext) for external translators. + +### `lang-import.sh` +Import from PO + +### `progmem.sh` + +Examine content of progmem sections (default is progmem1). + +Input: +- $OUTDIR/Firmware.ino.elf +- $OUTDIR/sketch/*.o (all object files) + +Outputs: +- text.sym - formated symbol listing of section '.text' +- $PROGMEM.sym - formated symbol listing of section '.progmemX' +- $PROGMEM.lss - disassembly listing file +- $PROGMEM.hex - variables - hex +- $PROGMEM.chr - variables - char escape +- $PROGMEM.var - variables - strings +- $PROGMEM.txt - text data only (not used) + +Description of process: +- check input files +- remove output files +- list symbol table of section '.text' from output elf file to text.sym (sorted by address) +- calculate start and stop address of section '.$PROGMEM' +- dump $PROGMEM data in hex format, cut disassembly (keep hex data only) into $PROGMEM.lss +- convert $PROGMEM.lss to $PROGMEM.hex: + - replace empty lines with '|' (variables separated by empty lines) + - remove address from multiline variables (keep address at first variable line only) + - remove '<' and '>:', remove whitespace at end of lines + - remove line-endings, replace separator with '\n' (join hex data lines - each line will contain single variable) +- convert $PROGMEM.hex to $PROGMEM.chr (prepare string data for character check and conversion) + - replace first space with tab + - replace second and third space with tab and space + - replace all remaining spaces with '\x' + - replace all tabs with spaces +- convert $PROGMEM.chr to $PROGMEM.var (convert data to text) - a set of special characters is escaped here including `\x0a` + + +### `textaddr.sh` + +Compiles `progmem1.var` and `lang_en.txt` files to `textaddr.txt` file (mapping of progmem addreses to text idenifiers). + +Description of process: +- check if input files exists +- create sorted list of strings from progmem1.var and lang_en.txt +- lines from progmem1.var will contain addres (8 chars) and english text +- lines from lang_en.txt will contain linenumber and english text +- after sort this will generate pairs of lines (line from progmem1 first) +- result of sort is compiled with simple script and stored into file textaddr.txt + +Input: +- progmem1.var +- lang_en.txt + +Output: +- textaddr.txt + + + +update_lang.sh From 7ad62bb6df3f3fd410a29f73cd24ed58d0ad5d3b Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 19 Aug 2019 15:43:08 +0200 Subject: [PATCH 024/190] code usage documentation start --- lang/translations.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lang/translations.md b/lang/translations.md index 79fdbfc54a..295bd8042e 100644 --- a/lang/translations.md +++ b/lang/translations.md @@ -7,6 +7,40 @@ - export PO files for translation: `lang-export.sh` - when translators finish their work use `lang-import.sh` +## Code / usage +There are 2 modes of operation. If `LANG_MODE==0`, only one language is being used (the default compilation approach from plain Arduino IDE). +The reset of this explanation is devoted to `LANG_MODE==1`: + +`language.h`: +```C++ +#define PROGMEM_I2 __attribute__((section(".loc_sec"))) +// section .loc_pri (originaly .progmem1) will be used for localized strings in english +#define PROGMEM_I1 __attribute__((section(".loc_pri"))) +// section .noloc (originaly progmem2) will be used for not localized strings in english +#define PROGMEM_N1 __attribute__((section(".noloc"))) +#define _I(s) (__extension__({static const char __c[] PROGMEM_I1 = "\xff\xff" s; &__c[0];})) +#define ISTR(s) "\xff\xff" s +#define _i(s) lang_get_translation(_I(s)) +#define _T(s) lang_get_translation(s) +``` +That explains the macros: +- `_i` expands into `lang_get_translation((__extension__({static const char __c[] PROGMEM_I1 = "\xff\xff" s; &__c[0];})))` . Note the two 0xff's in the beginning of the string. +- `_T` expands into `lang_get_translation(s)` without the two 0xff's at the beginning. + +The two 0xff's are somehow magically replaced by real string ID's where the translations are available (still don't know where). +```C++ +const char* lang_get_translation(const char* s){ + if (lang_selected == 0) return s + 2; //primary language selected, return orig. str. + if (lang_table == 0) return s + 2; //sec. lang table not found, return orig. str. + uint16_t ui = pgm_read_word(((uint16_t*)s)); //read string id + if (ui == 0xffff) return s + 2; //translation not found, return orig. str. + ui = pgm_read_word(((uint16_t*)(((char*)lang_table + 16 + ui*2)))); //read relative offset + if (pgm_read_byte(((uint8_t*)((char*)lang_table + ui))) == 0) //read first character + return s + 2;//zero length string == not translated, return orig. str. + return (const char*)((char*)lang_table + ui); //return calculated pointer +} +``` + ## Files ### `lang_en.txt` From d7057ebb16f4c620a9606749c7fff08b19f7a1d9 Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 19 Aug 2019 16:57:01 +0300 Subject: [PATCH 025/190] Add description for .loc_sec --- lang/translations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/translations.md b/lang/translations.md index 295bd8042e..076f833c3e 100644 --- a/lang/translations.md +++ b/lang/translations.md @@ -13,6 +13,7 @@ The reset of this explanation is devoted to `LANG_MODE==1`: `language.h`: ```C++ +// section .loc_sec (originaly .progmem0) will be used for localized translated strings #define PROGMEM_I2 __attribute__((section(".loc_sec"))) // section .loc_pri (originaly .progmem1) will be used for localized strings in english #define PROGMEM_I1 __attribute__((section(".loc_pri"))) From 05fe5b408c49a826f10881635b5907e80384dce3 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 19 Aug 2019 16:24:09 +0200 Subject: [PATCH 026/190] _i and _T differences and usage scenarios --- lang/translations.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/translations.md b/lang/translations.md index 295bd8042e..f0293f1ca0 100644 --- a/lang/translations.md +++ b/lang/translations.md @@ -24,8 +24,9 @@ The reset of this explanation is devoted to `LANG_MODE==1`: #define _T(s) lang_get_translation(s) ``` That explains the macros: -- `_i` expands into `lang_get_translation((__extension__({static const char __c[] PROGMEM_I1 = "\xff\xff" s; &__c[0];})))` . Note the two 0xff's in the beginning of the string. -- `_T` expands into `lang_get_translation(s)` without the two 0xff's at the beginning. +- `_i` expands into `lang_get_translation((__extension__({static const char __c[] PROGMEM_I1 = "\xff\xff" s; &__c[0];})))` . Note the two 0xff's in the beginning of the string. `_i` allows for declaring a string directly inplace of C++ code, no string table is used. The downside of this approach is obvious - the compiler is not able/willing to merge duplicit strings into one. +- `_T` expands into `lang_get_translation(s)` without the two 0xff's at the beginning. Must be used in conjunction with MSG tables in `messages.h`. Allows to declare a string only once and use many times. +- `_N` means not-translated. These strings reside in a different segment of memory. The two 0xff's are somehow magically replaced by real string ID's where the translations are available (still don't know where). ```C++ From f0642f88f19798b899f47692bc2b008d99ce2190 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 19 Aug 2019 17:37:23 +0200 Subject: [PATCH 027/190] 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 483d3018b4..faffd5207c 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 -#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 + bEnableForce_z=false; + + // 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 028/190] 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 f4f92fee75..0083c9eeb0 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 66bdc764f1..c20350aada 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 2c57c9443d..f414a1cc12 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 029/190] 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 0083c9eeb0..a8c6796901 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 2778e802b23c29b826998f6159782cc9700cd319 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Aug 2019 01:58:59 +0200 Subject: [PATCH 030/190] Modified few things in the workflow and more --- lang/translations.md | 64 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/lang/translations.md b/lang/translations.md index c32b4d8fbd..6c787787cd 100644 --- a/lang/translations.md +++ b/lang/translations.md @@ -2,10 +2,43 @@ ## Workflow -- Build firmware using build.sh. That creates necessary files in the `lang` dir. -- add messages that are new: investigate not-tran.txt, copy selected strings into `lang_add.txt` and run lang-add.sh -- export PO files for translation: `lang-export.sh` -- when translators finish their work use `lang-import.sh` +- Build firmware + - using `build.sh` + - using `PF-build.sh` with a `break` before `# build languages` +- change to `lang` folder +- check if lang scripts being able to run with `config.sh` + - if you get `Arduino main folder: NG` message change in `config.sh` `export ARDUINO=C:/arduino-1.8.5` to `export ARDUINO=` + -example: `export ARDUINO=D:/Github/Prusa-Firmware/PF-build-env-1.0.6/windows-64` +- run `lang-build.sh en` to create english `lang_en.tmp`, `lang_en.dat` and `lang_en.bin` files +- change in `fw-build.sh` `IGNORE_MISSING_TEXT=1` to `IGNORE_MISSING_TEXT=0` so it stops with error and generates `not_used.txt` and `not_tran.txt` +- run modified `fw-build.sh` + - `not_tran.txt` should be reviewed and added as these are potential missing translations + - copy `not_tran.txt` as `lang_add.txt` + - check if there are things you don't want to translate or must be modifed + - als check that the strings do not start with `spaces` as the scripts doesn't handle these well at this moment. + - run `lang-add.sh lang_add.txt` to add the missing translations to `lang_en.txt` and `lang_en_??.txt` + - `not_used.txt` should only contain mesages that aren't used in this variant like MK2.5 vs MK3 +- run `fw-clean.sh` to cleanup firmware related files +- delete `not_used.txt` and `not_tran.txt` +- run `lang-clean.sh` to cleanup language related files +- run `lang-export.sh all` to create PO files for translation these are stored in `/lang/po` folder + - Send them to translators and reviewers or + - copy these to `/lang/po/new` and + - translate these with POEdit the newly added messages + - easiest way is to choose `Validate`in POEdit as it shows you `errors` and the `missing transalations` / most likely the newly added at the top. +- The new translated files are expected in `/lang/po/new` folder so store the received files these +- run `lang-import.sh ` for each newly translated language + - script improvement to import "all" and other things would be great. +- Double check if something is missing or faulty + - run `lang-build.sh` to to create `lang_en.tmp/.dat/.bin` and `lang_en_??.tmp/.dat/.bin` files + - run `fw-build.sh` and check if there are still some messages in `not_tran.txt` that need attention +- After approval + - run `fw-clean.sh` to cleanup firmware related files + - run `lang-clean.sh` to cleanup language related files + - change in `fw-build.sh` back to `IGNORE_MISSING_TEXT=1` + - remove `break` from `PF-build.sh` script if that has been modified + - build your firmware with `build.sh`, `PF-build.sh` or how you normally do it. + - Check/Test firmware on printer ## Code / usage There are 2 modes of operation. If `LANG_MODE==0`, only one language is being used (the default compilation approach from plain Arduino IDE). @@ -65,7 +98,8 @@ const char* lang_get_translation(const char* s){ A simple list of strings that are not translated yet. ### `not_used.txt` -A list os strings not currently used in the firmware. May be removed from `lang_en_*.txt` files by hand. +A list os strings not currently used in this variant of the firmware or are obsolete. +Example: There are MK2.5 specific messages that aren't used when you compile a MK3 variant and vice versa. So be carefull and double check the code if this message is obsolete or just not used due to the chosen variant. ## Scripts @@ -138,7 +172,25 @@ Removes all language output files from lang folder. That means deleting: Exports PO (gettext) for external translators. ### `lang-import.sh` -Import from PO +Import from PO. + +Arguments: +- `$1` : language code (`en`, `cz`, `de`, `es`, `fr`, `it`, `pl`) +- empty/no arguments quits the script + +Input files: `.po` files like `de.po`, `es.po`, etc. + +Input folder: ´/lang/po/new´ + +Output files: + +Output foler: ´/lang/po/new´ + +Needed improments to scrpit: + - add `all` argument + - update `replace in translations` to all known special characters the LCD display with Japanese ROM cannot display + - move `lang_en_.txt` to folder `/lang` + - cleanup `_filtered.po`, `_new.po` and `nonasci.txt` ### `progmem.sh` From 2d4535af1f78b57cce638dcad618de85048039b2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Aug 2019 08:39:48 +0200 Subject: [PATCH 031/190] Added "All" argument and it is default in nothing is chosen The script had to started for each language code translation. Adding the "All" argument and make it as default if nothing is chosen makes the workflow easier. --- lang/lang-import.sh | 62 +++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/lang/lang-import.sh b/lang/lang-import.sh index 6176e053f0..b7d4b15721 100755 --- a/lang/lang-import.sh +++ b/lang/lang-import.sh @@ -4,7 +4,19 @@ # for importing translated xx.po LNG=$1 -if [ -z "$LNG" ]; then exit -1; fi +# if no arguments, 'all' is selected (all po and also pot will be generated) +if [ -z "$LNG" ]; then LNG=all; fi + +# if 'all' is selected, script will generate all po files and also pot file +if [ "$LNG" = "all" ]; then + ./lang-import.sh cz + ./lang-import.sh de + ./lang-import.sh es + ./lang-import.sh fr + ./lang-import.sh it + ./lang-import.sh pl + exit 0 +fi # language code (iso639-1) is equal to LNG LNGISO=$LNG @@ -28,43 +40,43 @@ sed -i 's/ \\n/ /g;s/\\n/ /g' $LNG'_filtered.po' #replace in czech translation if [ "$LNG" = "cz" ]; then - #replace '' with 'z' + #replace 'ž' with 'z' sed -i 's/\xc5\xbe/z/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'ì' with 'e' sed -i 's/\xc4\x9b/e/g' $LNG'_filtered.po' - #replace '' with 'i' + #replace 'í' with 'i' sed -i 's/\xc3\xad/i/g' $LNG'_filtered.po' - #replace '' with 'r' + #replace 'ø' with 'r' sed -i 's/\xc5\x99/r/g' $LNG'_filtered.po' - #replace '' with 'c' + #replace 'è' with 'c' sed -i 's/\xc4\x8d/c/g' $LNG'_filtered.po' - #replace '' with 'a' + #replace 'á' with 'a' sed -i 's/\xc3\xa1/a/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' fi #replace in german translation if [ "$LNG" = "de" ]; then - #replace '' with 'ae' + #replace 'ä' with 'ae' sed -i 's/\xc3\xa4/ae/g' $LNG'_filtered.po' - #replace '' with 'ue' + #replace 'ü' with 'ue' sed -i 's/\xc3\xbc/ue/g' $LNG'_filtered.po' - #replace '' with 'oe' + #replace 'ö' with 'oe' sed -i 's/\xc3\xb6/oe/g' $LNG'_filtered.po' fi #replace in spain translation if [ "$LNG" = "es" ]; then - #replace '' with 'a' + #replace 'á' with 'a' sed -i 's/\xc3\xa1/a/g' $LNG'_filtered.po' #replace '?' with '?' sed -i 's/\xc2\xbf/?/g' $LNG'_filtered.po' - #replace '' with 'o' + #replace 'ó' with 'o' sed -i 's/\xc3\xb3/o/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'i' + #replace 'í' with 'i' sed -i 's/\xc3\xad/i/g' $LNG'_filtered.po' #replace '!' with '!' sed -i 's/\xc2\xa1/!/g' $LNG'_filtered.po' @@ -74,29 +86,29 @@ fi #replace in french translation if [ "$LNG" = "fr" ]; then - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'E' + #replace 'É' with 'E' sed -i 's/\xc3\x89/E/g' $LNG'_filtered.po' - #replace '' with 'e' (left) + #replace 'é' with 'e' (left) sed -i 's/\xc3\xa8/e/g' $LNG'_filtered.po' - #replace '' with 'a' (left) + #replace 'á' with 'a' (left) sed -i 's/\xc3\xa0/a/g' $LNG'_filtered.po' fi #replace in italian translation if [ "$LNG" = "it" ]; then - #replace '' with 'e' (left) + #replace 'é' with 'e' (left) sed -i 's/\xc3\xa8/e/g' $LNG'_filtered.po' - #replace '' with 'a' (left) + #replace 'á' with 'a' (left) sed -i 's/\xc3\xa0/a/g' $LNG'_filtered.po' - #replace '' with 'o' (left) + #replace 'ó' with 'o' (left) sed -i 's/\xc3\xb2/o/g' $LNG'_filtered.po' - #replace '' with 'u' (left) + #replace 'ú' with 'u' (left) sed -i 's/\xc3\xb9/u/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'E' (left) + #replace 'É' with 'E' (left) sed -i 's/\xc3\x88/E/g' $LNG'_filtered.po' fi From 47e1311d64a855a943fd74001debf4c47e7d50d2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Aug 2019 09:30:11 +0200 Subject: [PATCH 032/190] Added few German/French diacritical characters See https://docs.oracle.com/cd/E29584_01/webhelp/mdex_basicDev/src/rbdv_chars_mapping.html --- lang/lang-import.sh | 72 +++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/lang/lang-import.sh b/lang/lang-import.sh index 6176e053f0..0b0a634e63 100755 --- a/lang/lang-import.sh +++ b/lang/lang-import.sh @@ -28,43 +28,51 @@ sed -i 's/ \\n/ /g;s/\\n/ /g' $LNG'_filtered.po' #replace in czech translation if [ "$LNG" = "cz" ]; then - #replace '' with 'z' + #replace 'ž' with 'z' sed -i 's/\xc5\xbe/z/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'ì' with 'e' sed -i 's/\xc4\x9b/e/g' $LNG'_filtered.po' - #replace '' with 'i' + #replace 'í' with 'i' sed -i 's/\xc3\xad/i/g' $LNG'_filtered.po' - #replace '' with 'r' + #replace 'ø' with 'r' sed -i 's/\xc5\x99/r/g' $LNG'_filtered.po' - #replace '' with 'c' + #replace 'è' with 'c' sed -i 's/\xc4\x8d/c/g' $LNG'_filtered.po' - #replace '' with 'a' + #replace 'á' with 'a' sed -i 's/\xc3\xa1/a/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' fi -#replace in german translation +#replace in german translation https://en.wikipedia.org/wiki/German_orthography if [ "$LNG" = "de" ]; then - #replace '' with 'ae' + #replace 'ä' with 'ae' sed -i 's/\xc3\xa4/ae/g' $LNG'_filtered.po' - #replace '' with 'ue' + #replace 'Ä' with 'Ae' + sed -i 's/\xc3\x84/Ae/g' $LNG'_filtered.po' + #replace 'ü' with 'ue' sed -i 's/\xc3\xbc/ue/g' $LNG'_filtered.po' - #replace '' with 'oe' + #replace 'Ü' with 'Ue' + sed -i 's/\xc3\x9c/Ue/g' $LNG'_filtered.po' + #replace 'ö' with 'oe' sed -i 's/\xc3\xb6/oe/g' $LNG'_filtered.po' + #replace 'Ö' with 'Oe' + sed -i 's/\xc3\x96/Oe/g' $LNG'_filtered.po' + #replace 'ß' with 'ss' + sed -i 's/\xc3\x9f/ss/g' $LNG'_filtered.po' fi #replace in spain translation if [ "$LNG" = "es" ]; then - #replace '' with 'a' + #replace 'á' with 'a' sed -i 's/\xc3\xa1/a/g' $LNG'_filtered.po' - #replace '?' with '?' + #replace '¿' with '?' sed -i 's/\xc2\xbf/?/g' $LNG'_filtered.po' - #replace '' with 'o' + #replace 'ó' with 'o' sed -i 's/\xc3\xb3/o/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'i' + #replace 'í' with 'i' sed -i 's/\xc3\xad/i/g' $LNG'_filtered.po' #replace '!' with '!' sed -i 's/\xc2\xa1/!/g' $LNG'_filtered.po' @@ -72,31 +80,39 @@ if [ "$LNG" = "es" ]; then sed -i 's/\xc3\xb1/n/g' $LNG'_filtered.po' fi -#replace in french translation +#replace in french translation https://en.wikipedia.org/wiki/French_orthography if [ "$LNG" = "fr" ]; then - #replace '' with 'e' + #replace 'á' with 'a' (right) + sed -i 's/\xc3\xa1/a/g' $LNG'_filtered.po' + #replace 'Á' with 'A' (right) + sed -i 's/\xc3\x81/A/g' $LNG'_filtered.po' + #replace 'à' with 'a' (left) + sed -i 's/\xc3\xa0/a/g' $LNG'_filtered.po' + #replace 'À' with 'A' (left) + sed -i 's/\xc3\x80/A/g' $LNG'_filtered.po' + #replace 'é' with 'e' (right) sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'E' + #replace 'É' with 'E' (right) sed -i 's/\xc3\x89/E/g' $LNG'_filtered.po' - #replace '' with 'e' (left) + #replace 'è' with 'e' (left) sed -i 's/\xc3\xa8/e/g' $LNG'_filtered.po' - #replace '' with 'a' (left) - sed -i 's/\xc3\xa0/a/g' $LNG'_filtered.po' + #replace 'È' with 'E' (left) + sed -i 's/\xc3\x88/E/g' $LNG'_filtered.po' fi #replace in italian translation if [ "$LNG" = "it" ]; then - #replace '' with 'e' (left) + #replace 'é' with 'e' (left) sed -i 's/\xc3\xa8/e/g' $LNG'_filtered.po' - #replace '' with 'a' (left) + #replace 'á' with 'a' (left) sed -i 's/\xc3\xa0/a/g' $LNG'_filtered.po' - #replace '' with 'o' (left) + #replace 'ó' with 'o' (left) sed -i 's/\xc3\xb2/o/g' $LNG'_filtered.po' - #replace '' with 'u' (left) + #replace 'ú' with 'u' (left) sed -i 's/\xc3\xb9/u/g' $LNG'_filtered.po' - #replace '' with 'e' + #replace 'é' with 'e' sed -i 's/\xc3\xa9/e/g' $LNG'_filtered.po' - #replace '' with 'E' (left) + #replace 'É' with 'E' (left) sed -i 's/\xc3\x88/E/g' $LNG'_filtered.po' fi From a7c2aec04c226297461866b1452166cdf007d5c6 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 21 Aug 2019 09:59:51 +0200 Subject: [PATCH 033/190] 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 f4f92fee75..d4c2fdb18c 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 1edac56bf0..6466edc454 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 2c81a6e836..e7a59e75ca 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 4a8d6659ab..752d072583 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 b6a9f8361e..7904c45a5f 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 66bdc764f1..1e0aa9cc81 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 514b062107b9a22e26e88055444bb7e6081e6c0b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Aug 2019 10:28:28 +0200 Subject: [PATCH 034/190] Added `lcd_menu` format description Added some documentation how the LCD menus look like and added max character values for translations. There are more things needed and also the placement in the code is an open task. Depending on the decision if we use `messages.c/h` --- Firmware/ultralcd.cpp | 119 ++++++++++++++++++++++++++++++++---------- 1 file changed, 92 insertions(+), 27 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index de56ea028b..e730457d2d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1826,6 +1826,12 @@ void lcd_menu_extruder_info() // NOT static due to using ins static void lcd_menu_fails_stats_mmu() { +//|01234567890123456789| +//| Main | c=18 +//| Last print | c=18 +//| Total | c=18 +//| | +//---------------------- MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_mmu_print); @@ -1835,12 +1841,12 @@ static void lcd_menu_fails_stats_mmu() static void lcd_menu_fails_stats_mmu_print() { -//01234567890123456789 -//Last print failures -// MMU fails 000 -// MMU load fails 000 -// -////////////////////// +//|01234567890123456789| +//|Last print failures | c=20 +//| MMU fails: 000| c=15 +//| MMU load fails: 000| c=15 +//| | +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); @@ -1851,12 +1857,12 @@ static void lcd_menu_fails_stats_mmu_print() static void lcd_menu_fails_stats_mmu_total() { -//01234567890123456789 -//Last print failures -// MMU fails 000 -// MMU load fails 000 -// -////////////////////// +//|01234567890123456789| +//|Total failures | c=20 +//| MMU fails: 000| c=15 +//| MMU load fails: 000| c=15 +//| MMU power fails:000| c=15 +//---------------------- mmu_command(MmuCmd::S3); lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL_TOT); @@ -1869,12 +1875,12 @@ static void lcd_menu_fails_stats_mmu_total() #if defined(TMC2130) && defined(FILAMENT_SENSOR) static void lcd_menu_fails_stats_total() { -//01234567890123456789 -//Total failures -// Power failures 000 -// Filam. runouts 000 -// Crash X 000 Y 000 -////////////////////// +//|01234567890123456789| +//|Last print failures | c=20 +//| Power failures: 000| c=14 +//| Filam. runouts: 000| c=14 +//| Crash X:000 Y:000| c=7 for Crash +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint16_t power = eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT); uint16_t filam = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); @@ -1887,12 +1893,12 @@ static void lcd_menu_fails_stats_total() static void lcd_menu_fails_stats_print() { -//01234567890123456789 -//Last print failures -// Power failures 000 -// Filam. runouts 000 -// Crash X 000 Y 000 -////////////////////// +//|01234567890123456789| +//|Last print failures | c=20 +//| Power failures: 000| c=14 +//| Filam. runouts: 000| c=14 +//| Crash X:000 Y:000| c=7 for Crash +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t power = eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT); uint8_t filam = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); @@ -1912,6 +1918,12 @@ static void lcd_menu_fails_stats_print() */ static void lcd_menu_fails_stats() { +//|01234567890123456789| +//| Main | c=18 +//| Last print | c=18 +//| Total | c=18 +//| | +//---------------------- MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); @@ -1937,6 +1949,12 @@ static void lcd_menu_fails_stats() */ static void lcd_menu_fails_stats() { +//|01234567890123456789| +//|Last print failures | c=20 +//| Filam. runouts: 000| c=15 +//|Total failures | c=20 +//| Filam. runouts: 000| c=15 +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); @@ -1947,6 +1965,11 @@ static void lcd_menu_fails_stats() #else static void lcd_menu_fails_stats() { +//|01234567890123456789| +//| Main | c=18 +//| | +//| | +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); @@ -1964,6 +1987,12 @@ extern char* __malloc_heap_end; static void lcd_menu_debug() { +//|01234567890123456789| +//|RAM statistics | c=20 +//| SP_min: 0000| c=14 +//| heap_start: 0000| c=14 +//| heap_end: 0000| c=14 +//---------------------- #ifdef DEBUG_STACK_MONITOR lcd_home(); lcd_printf_P(PSTR("RAM statistics\n" " SP_min: 0x%04x\n" " heap_start: 0x%04x\n" " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); @@ -1975,6 +2004,12 @@ static void lcd_menu_debug() static void lcd_menu_temperatures() { +//|01234567890123456789| +//| Nozzle: 000°| c=14 +//| Bed: 000°| c=14 +//| Ambient: 000°| c=14 +//| PINDA: 000°| c=14 +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout lcd_home(); lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); @@ -1994,6 +2029,12 @@ static void lcd_menu_temperatures() #define VOLT_DIV_REF 5 static void lcd_menu_voltages() { +//|01234567890123456789| +//| | +//| PWR: 00.0V | c=12 +//| Bed: 00.0V | c=12 +//| | +//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; @@ -2006,6 +2047,12 @@ static void lcd_menu_voltages() #ifdef TMC2130 static void lcd_menu_belt_status() { +//|01234567890123456789| +//| Belt status | c=19 +//| X: 000 | c=13 +//| Y: 000 | c=13 +//| | +//---------------------- lcd_home(); lcd_printf_P(PSTR("%S\n" " X %d\n" " Y %d"), _i("Belt status"), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); menu_back_if_clicked(); @@ -2827,6 +2874,12 @@ void lcd_menu_statistics() { if (IS_SD_PRINTING) { + //|01234567890123456789| + //|Filament used: | c=19 + //| 0000.00m | + //|Print time: | c=19 + //| 00h : 00m : 00s | + //---------------------- const float _met = ((float)total_filament_used) / (100000.f); const uint32_t _t = (_millis() - starttime) / 1000ul; const int _h = _t / 3600; @@ -2844,6 +2897,12 @@ void lcd_menu_statistics() } else { + //|01234567890123456789| + //|Total filament: | c=19 + //| 0000.00m | + //|Total print time | c=19 + //| 00d : 00h : 00m | + //---------------------- unsigned long _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); unsigned long _time = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME); //in minutes uint8_t _hours, _minutes; @@ -2952,10 +3011,10 @@ static void lcd_move_e() static void lcd_menu_xyz_y_min() { //|01234567890123456789| -//|Y distance from min:| +//|Y distance from min | c=19 //|--------------------| -//|Left: N/A | -//|Right: N/A | +//|Left: 00.00mm | c=10 +//|Right: 00.00mm | c=10 //---------------------- float distanceMin[2]; count_xyz_details(distanceMin); @@ -3024,6 +3083,12 @@ static void lcd_menu_xyz_skew() */ static void lcd_menu_xyz_offset() { +//|01234567890123456789| +//|[0;0] point offset | c=20 +//|--------------------| +//|X: 000.00mm| c=10 +//|Y: 000.00mm| c=10 +//---------------------- lcd_set_cursor(0,0); lcd_puts_P(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET lcd_puts_at_P(0, 1, separator); From d3123a74b08f9e078aeca90eb1ec4ae4fe36799c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 22 Aug 2019 04:58:16 +0200 Subject: [PATCH 035/190] Updated LCD menu documentation to new form/syntax --- Firmware/ultralcd.cpp | 494 ++++++++++++++++++++++++++---------------- 1 file changed, 312 insertions(+), 182 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e730457d2d..4a19132871 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -869,18 +869,23 @@ void lcdui_print_status_line(void) lcd_print(' '); } +//! @brief Show Status Screen +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |N 000/000D Z000.0 | +//! |B 000/000D F100% | +//! |USB100% T0 t--:-- | +//! |Status line.........| +//! ---------------------- +//! N - nozzle temp symbol LCD_STR_THERMOMETER +//! D - Degree sysmbol LCD_STR_DEGREE +//! B - bed temp symbol LCD_STR_BEDTEMP +//! F - feedrate symbol LCD_STR_FEEDRATE +//! t - clock symbol LCD_STR_THERMOMETER +//! @endcode void lcdui_print_status_screen(void) { -//|01234567890123456789| -//|N 000/000D Z000.0 | -//|B 000/000D F100% | -//|USB100% T0 t--:-- | -//|Status line.........| -//---------------------- -//N - nozzle temp symbol LCD_STR_THERMOMETER -//B - bed temp symbol LCD_STR_BEDTEMP -//F - feedrate symbol LCD_STR_FEEDRATE -//t - clock symbol LCD_STR_THERMOMETER lcd_set_cursor(0, 0); //line 0 @@ -1767,14 +1772,18 @@ static void lcd_cooldown() } +//! @brief Show Extruder Info +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Nozzle FAN: 0000 RPM| FAN c=10 r=1 SPEED c=3 r=1 +//! |Print FAN: 0000 RPM| FAN c=10 r=1 SPEED c=3 r=1 +//! |Fil. Xd:000 Yd:000 | Fil. c=4 r=1 +//! |Int: 000 Shut: 000 | Int: c=4 r=1 Shut: c=4 r=1 +//! ---------------------- +//! @endcode void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") { -//|01234567890123456789| -//|Nozzle FAN: RPM| -//|Print FAN: RPM| -//|Fil. Xd: Yd: | -//|Int: Shut: | -//---------------------- int fan_speed_RPM[2]; // Display Nozzle fan RPM fan_speed_RPM[0] = 60*fan_speed[0]; @@ -1787,9 +1796,9 @@ void lcd_menu_extruder_info() // NOT static due to using ins "%S: %4d RPM\n" "%S: %4d RPM\n" ), - _i("Nozzle FAN"), + _i("Nozzle FAN"), ////c=10 r=1 fan_speed_RPM[0], - _i("Print FAN"), + _i("Print FAN"), ////c=10 r=1 fan_speed_RPM[1] ); @@ -1811,8 +1820,8 @@ void lcd_menu_extruder_info() // NOT static due to using ins if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) pat9125_update(); lcd_printf_P(_N( - "Fil. Xd:%3d Yd:%3d\n" - "Int: %3d Shut: %3d" + "Fil. Xd:%3d Yd:%3d\n" ////c=4 r=1 + "Int: %3d Shut: %3d" ////c=4 r=1 ////c=4 r=1 ), pat9125_x, pat9125_y, pat9125_b, pat9125_s @@ -1824,152 +1833,163 @@ void lcd_menu_extruder_info() // NOT static due to using ins menu_back_if_clicked(); } +//! @brief Show Fails Statistics MMU +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Main | c=18 r=1 +//! | Last print | c=18 r=1 +//! | Total | c=18 r=1 +//! | | +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats_mmu() { -//|01234567890123456789| -//| Main | c=18 -//| Last print | c=18 -//| Total | c=18 -//| | -//---------------------- MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_mmu_print); - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); + MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_mmu_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_END(); } +//! @brief Show Last Print Failures Statistics MMU +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Last print failures | c=20 r=1 +//! | MMU fails: 000| c=14 r=1 +//! | MMU load fails: 000| c=14 r=1 +//! | | +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats_mmu_print() { -//|01234567890123456789| -//|Last print failures | c=20 -//| MMU fails: 000| c=15 -//| MMU load fails: 000| c=15 -//| | -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d"), _i("Last print failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails); + lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d"), _i("Last print failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 menu_back_if_clicked_fb(); } +//! @brief Show Total Failures Statistics MMU +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Total failures | c=20 r=1 +//! | MMU fails: 000| c=14 r=1 +//! | MMU load fails: 000| c=14 r=1 +//! | MMU power fails:000| c=14 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats_mmu_total() { -//|01234567890123456789| -//|Total failures | c=20 -//| MMU fails: 000| c=15 -//| MMU load fails: 000| c=15 -//| MMU power fails:000| c=15 -//---------------------- mmu_command(MmuCmd::S3); lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL_TOT); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL_TOT); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S %-3d"), _i("Total failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails, _i("MMU power fails"), mmu_power_failures); + lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S %-3d"), _i("Total failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails, _i("MMU power fails"), mmu_power_failures); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=14 r=1 menu_back_if_clicked_fb(); } #if defined(TMC2130) && defined(FILAMENT_SENSOR) +//! @brief Show Total Failures Statistics MMU +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Total failures | c=20 r=1 +//! | Power failures: 000| c=14 r=1 +//! | Filam. runouts: 000| c=14 r=1 +//! | Crash X:000 Y:000| c=7 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats_total() { -//|01234567890123456789| -//|Last print failures | c=20 -//| Power failures: 000| c=14 -//| Filam. runouts: 000| c=14 -//| Crash X:000 Y:000| c=7 for Crash -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint16_t power = eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT); uint16_t filam = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); uint16_t crashX = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT); uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); + lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=7 r=1 menu_back_if_clicked_fb(); } +//! @brief Show Last Print Failures Statistics +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Last print failures | c=20 r=1 +//! | Power failures: 000| c=14 r=1 +//! | Filam. runouts: 000| c=14 r=1 +//! | Crash X:000 Y:000| c=7 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats_print() { -//|01234567890123456789| -//|Last print failures | c=20 -//| Power failures: 000| c=14 -//| Filam. runouts: 000| c=14 -//| Crash X:000 Y:000| c=7 for Crash -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t power = eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT); uint8_t filam = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint8_t crashX = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_X); uint8_t crashY = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_Y); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); + lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=7 r=1 menu_back_if_clicked_fb(); } -/** - * @brief Open fail statistics menu - * - * This version of function is used, when there is filament sensor, - * power failure and crash detection. - * There are Last print and Total menu items. - */ +//! @brief Open fail statistics menu +//! +//! This version of function is used, when there is filament sensor, +//! power failure and crash detection. +//! There are Last print and Total menu items. +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Main | c=18 r=1 +//! | Last print | c=18 r=1 +//! | Total | c=18 r=1 +//! | | +//! ---------------------- +//! @endcode + static void lcd_menu_fails_stats() { -//|01234567890123456789| -//| Main | c=18 -//| Last print | c=18 -//| Total | c=18 -//| | -//---------------------- MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); + MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_END(); } #elif defined(FILAMENT_SENSOR) -/** - * @brief Print last print and total filament run outs - * - * This version of function is used, when there is filament sensor, - * but no other sensors (e.g. power failure, crash detection). - * - * Example screen: - * @code - * 01234567890123456789 - * Last print failures - * Filam. runouts 0 - * Total failures - * Filam. runouts 5 - * @endcode - */ +//! +//! @brief Print last print and total filament run outs +//! +//! This version of function is used, when there is filament sensor, +//! but no other sensors (e.g. power failure, crash detection). +//! +//! Example screen: +//! @code{.unparsed} +//! |01234567890123456789| +//! |Last print failures | c=20 r=1 +//! | Filam. runouts: 000| c=14 r=1 +//! |Total failures | c=20 r=1 +//! | Filam. runouts: 000| c=14 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_fails_stats() { -//|01234567890123456789| -//|Last print failures | c=20 -//| Filam. runouts: 000| c=15 -//|Total failures | c=20 -//| Filam. runouts: 000| c=15 -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); lcd_home(); - lcd_printf_P(PSTR("Last print failures\n" " Filam. runouts %-3d\n" "Total failures\n" " Filam. runouts %-3d"), filamentLast, filamentTotal); + lcd_printf_P(PSTR("Last print failures\n" " Filam. runouts %-3d\n" "Total failures\n" " Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=20 r=1 ////c=14 r=1 ////c=20 r=1 ////c=14 r=1 menu_back_if_clicked(); } #else static void lcd_menu_fails_stats() { -//|01234567890123456789| -//| Main | c=18 -//| | -//| | -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); @@ -1985,38 +2005,47 @@ extern char* __malloc_heap_start; extern char* __malloc_heap_end; #endif //DEBUG_STACK_MONITOR +//! @brief Show Debug Information +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |RAM statistics | c=20 r=1 +//! | SP_min: 0000| c=14 r=1 +//! | heap_start: 0000| c=14 r=1 +//! | heap_end: 0000| c=14 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_debug() { -//|01234567890123456789| -//|RAM statistics | c=20 -//| SP_min: 0000| c=14 -//| heap_start: 0000| c=14 -//| heap_end: 0000| c=14 -//---------------------- #ifdef DEBUG_STACK_MONITOR lcd_home(); - lcd_printf_P(PSTR("RAM statistics\n" " SP_min: 0x%04x\n" " heap_start: 0x%04x\n" " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); + lcd_printf_P(PSTR("RAM statistics\n" " SP_min: 0x%04x\n" " heap_start: 0x%04x\n" " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=14 r=1 #endif //DEBUG_STACK_MONITOR menu_back_if_clicked_fb(); } #endif /* DEBUG_BUILD */ +//! @brief Show Temperatures +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Nozzle: 000D| c=14 r=1 +//! | Bed: 000D| c=14 r=1 +//! | Ambient: 000D| c=14 r=1 +//! | PINDA: 000D| c=14 r=1 +//! ---------------------- +//! D - Degree sysmbol LCD_STR_DEGREE +//! @endcode static void lcd_menu_temperatures() { -//|01234567890123456789| -//| Nozzle: 000°| c=14 -//| Bed: 000°| c=14 -//| Ambient: 000°| c=14 -//| PINDA: 000°| c=14 -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout lcd_home(); - lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); + lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); ////c=14 r=1 ////c=14 r=1 #ifdef AMBIENT_THERMISTOR - lcd_printf_P(PSTR(" %S: %d%c\n" " PINDA: %d%c"), _i("Ambient"), (int)current_temperature_ambient, '\x01', (int)current_temperature_pinda, '\x01'); + lcd_printf_P(PSTR(" %S: %d%c\n" " %S: %d%c"), _i("Ambient"), (int)current_temperature_ambient, '\x01', _i("PINDA"), (int)current_temperature_pinda, '\x01'); ////c=14 r=1 #else //AMBIENT_THERMISTOR - lcd_printf_P(PSTR(" PINDA: %d%c"), (int)current_temperature_pinda, '\x01'); + lcd_printf_P(PSTR(" %S: %d%c"), _i("PINDA"), (int)current_temperature_pinda, '\x01'); ////c=14 r=1 #endif //AMBIENT_THERMISTOR menu_back_if_clicked(); @@ -2027,34 +2056,43 @@ static void lcd_menu_temperatures() #define VOLT_DIV_R2 2370 #define VOLT_DIV_FAC ((float)VOLT_DIV_R2 / (VOLT_DIV_R2 + VOLT_DIV_R1)) #define VOLT_DIV_REF 5 +//! @brief Show Voltages +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | | +//! | PWR: 00.0V | c=12 r=1 +//! | Bed: 00.0V | c=12 r=1 +//! | | +//! ---------------------- +//! @endcode + static void lcd_menu_voltages() { -//|01234567890123456789| -//| | -//| PWR: 00.0V | c=12 -//| Bed: 00.0V | c=12 -//| | -//---------------------- lcd_timeoutToStatus.stop(); //infinite timeout float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC; lcd_home(); - lcd_printf_P(PSTR(" PWR: %d.%01dV\n" " BED: %d.%01dV"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr)), (int)volt_bed, (int)(10*fabs(volt_bed - (int)volt_bed))); + lcd_printf_P(PSTR(" $S: %d.%01dV\n" " $S: %d.%01dV"), _i("PWR"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr)), _i("Bed"), (int)volt_bed, (int)(10*fabs(volt_bed - (int)volt_bed))); ////c=12 r=1 ////c=12 r=1 menu_back_if_clicked(); } #endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN #ifdef TMC2130 +//! @brief Show Belt Status +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Belt status | c=18 r=1 +//! | X: 000 | +//! | Y: 000 | +//! | | +//! ---------------------- +//! @endcode static void lcd_menu_belt_status() { -//|01234567890123456789| -//| Belt status | c=19 -//| X: 000 | c=13 -//| Y: 000 | c=13 -//| | -//---------------------- lcd_home(); - lcd_printf_P(PSTR("%S\n" " X %d\n" " Y %d"), _i("Belt status"), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); + lcd_printf_P(PSTR("%S\n" " X %d\n" " Y %d"), _i("Belt status"), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); ////c=18 r=1 menu_back_if_clicked(); } #endif //TMC2130 @@ -2074,6 +2112,7 @@ static void lcd_menu_test_restore() } #endif //RESUME_DEBUG +//! @brief Show Preheat Menu static void lcd_preheat_menu() { MENU_BEGIN(); @@ -2099,6 +2138,78 @@ static void lcd_preheat_menu() MENU_END(); } +//! @brief Show Support Menu +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Main | +//! | Firmware: | c=18 r=1 +//! | 3.7.2.-2363 | c=16 r=1 +//! | prusa3d.com | MSG_PRUSA3D +//! | forum.prusa3d.com | MSG_PRUSA3D_FORUM +//! | howto.prusa3d.com | MSG_PRUSA3D_HOWTO +//! | -------------- | STR_SEPARATOR +//! | 1_75mm_MK3 | FILAMENT_SIZE +//! | howto.prusa3d.com | ELECTRONICS +//! | howto.prusa3d.com | NOZZLE_TYPE +//! | -------------- | STR_SEPARATOR +//! | Date: | c=17 r=1 +//! | MMM DD YYYY | __DATE__ +//! | -------------- | STR_SEPARATOR +//! @endcode +//! +//! If MMU is connected +//! +//! @code{.unparsed} +//! | MMU2 connected | c=18 r=1 +//! | FW: 1.0.6-7064523 | +//! @endcode +//! +//! If MMU is not connected +//! +//! @code{.unparsed} +//! | MMU2 N/A | c=18 r=1 +//! @endcode +//! +//! If Flash Air is connected +//! +//! @code{.unparsed} +//! | -------------- | STR_SEPARATOR +//! | FlashAir IP Addr: | c=18 r=1 +//! | 192.168.1.100 | +//! @endcode +//! +//! @code{.unparsed} +//! | -------------- | STR_SEPARATOR +//! | XYZ cal. details | MSG_XYZ_DETAILS +//! | Extruder info | MSG_INFO_EXTRUDER +//! | XYZ cal. details | MSG_INFO_SENSORS +//! @endcode +//! +//! If TMC2130 defined +//! +//! @code{.unparsed} +//! | Belt status | MSG_MENU_BELT_STATUS +//! @endcode +//! +//! @code{.unparsed} +//! | Temperatures | MSG_MENU_TEMPERATURES +//! @endcode +//! +//! If Voltage Bed and PWR Pin are defined +//! +//! @code{.unparsed} +//! | Voltages | MSG_MENU_VOLTAGES +//! @endcode +//! +//! +//! If DEBUG_BUILD is defined +//! +//! @code{.unparsed} +//! | Debug | c=18 r=1 +//! @endcode +//! ---------------------- +//! @endcode static void lcd_support_menu() { typedef struct @@ -2160,8 +2271,8 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); if (mmu_enabled) { - MENU_ITEM_BACK_P(_i("MMU2 connected")); - MENU_ITEM_BACK_P(PSTR(" FW:")); + MENU_ITEM_BACK_P(_i("MMU2 connected")); ////c=18 r=1 + MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17 r=1 if (((menu_item - 1) == menu_line) && lcd_draw_update) { lcd_set_cursor(6, menu_row); @@ -2178,7 +2289,7 @@ static void lcd_support_menu() // Show the FlashAir IP address, if the card is available. if (_md->is_flash_air) { MENU_ITEM_BACK_P(STR_SEPARATOR); - MENU_ITEM_BACK_P(PSTR("FlashAir IP Addr:")); + MENU_ITEM_BACK_P(PSTR("FlashAir IP Addr:")); //c=18 r=1 ///! MENU_ITEM(back_RAM, _md->ip_str, 0); } @@ -2199,7 +2310,7 @@ static void lcd_support_menu() #endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN #ifdef DEBUG_BUILD - MENU_ITEM_SUBMENU_P(PSTR("Debug"), lcd_menu_debug); + MENU_ITEM_SUBMENU_P(PSTR("Debug"), lcd_menu_debug);////c=18 r=1 #endif /* DEBUG_BUILD */ #endif //MK1BP @@ -2853,9 +2964,9 @@ if(0) //! //! @code{.unparsed} //! |01234567890123456789| -//! |Filament used: | +//! |Filament used: | c=18 r=1 //! | 00.00m | -//! |Print time: | +//! |Print time: | c=18 r=1 //! | 00h 00m 00s | //! ---------------------- //! @endcode @@ -2864,9 +2975,9 @@ if(0) //! //! @code{.unparsed} //! |01234567890123456789| -//! |Total filament : | +//! |Total filament : | c=18 r=1 //! | 000.00 m | -//! |Total print time : | +//! |Total print time : | c=18 r=1 //! | 00d :00h :00 m | //! ---------------------- //! @endcode @@ -2874,12 +2985,6 @@ void lcd_menu_statistics() { if (IS_SD_PRINTING) { - //|01234567890123456789| - //|Filament used: | c=19 - //| 0000.00m | - //|Print time: | c=19 - //| 00h : 00m : 00s | - //---------------------- const float _met = ((float)total_filament_used) / (100000.f); const uint32_t _t = (_millis() - starttime) / 1000ul; const int _h = _t / 3600; @@ -2892,17 +2997,11 @@ void lcd_menu_statistics() "%8.2fm\n" "%S:\n" "%2dh %02dm %02ds" - ),_i("Filament used"), _met, _i("Print time"), _h, _m, _s); + ),_i("Filament used"), _met, _i("Print time"), _h, _m, _s); ////c=18 r=1 ////c=18 r=1 menu_back_if_clicked_fb(); } else { - //|01234567890123456789| - //|Total filament: | c=19 - //| 0000.00m | - //|Total print time | c=19 - //| 00d : 00h : 00m | - //---------------------- unsigned long _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); unsigned long _time = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME); //in minutes uint8_t _hours, _minutes; @@ -3005,17 +3104,20 @@ static void lcd_move_e() } -//@brief Show measured Y distance of front calibration points from Y_MIN_POS -//If those points are detected too close to edge of reachable area, their confidence is lowered. -//This functionality is applied more often for MK2 printers. +//! @brief Show measured Y distance of front calibration points from Y_MIN_POS +//! If those points are detected too close to edge of reachable area, their confidence is lowered. +//! This functionality is applied more often for MK2 printers. + +//! @code{.unparsed} +//! |01234567890123456789| +//! |Y distance from min | c=19 r=1 +//! | -------------- | STR_SEPARATOR +//! |Left: 00.00mm | c=11 r=1 +//! |Right: 00.00mm | c=11 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_xyz_y_min() { -//|01234567890123456789| -//|Y distance from min | c=19 -//|--------------------| -//|Left: 00.00mm | c=10 -//|Right: 00.00mm | c=10 -//---------------------- float distanceMin[2]; count_xyz_details(distanceMin); lcd_home(); @@ -3025,15 +3127,15 @@ static void lcd_menu_xyz_y_min() "%S:\n" "%S:" ), - _i("Y distance from min"), + _i("Y distance from min"), ////c=19 r=1 separator, - _i("Left"), - _i("Right") + _i("Left"), ////c=11 r=1 + _i("Right") ////c=11 r=1 ); for (uint8_t i = 0; i < 2; i++) { lcd_set_cursor(11,2+i); - if (distanceMin[i] >= 200) lcd_puts_P(_N("N/A")); + if (distanceMin[i] >= 200) lcd_puts_P(_N("N/A")); ////c=3 r=1 else lcd_printf_P(_N("%6.2fmm"), distanceMin[i]); } if (lcd_clicked()) @@ -3046,14 +3148,19 @@ float _deg(float rad) return rad * 180 / M_PI; } +//! @brief Show Measured XYZ Skew +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Measured skew: 0.00D| c=13 r=1 +//! | -------------- | STR_SEPARATOR +//! |Slight skew: 0.12D| c=13 r=1 c=4 r=1 +//! |Severe skew: 0.25D| c=13 r=1 c=4 r=1 +//! ---------------------- +//! D - Degree sysmbol LCD_STR_DEGREE +//! @endcode static void lcd_menu_xyz_skew() { -//|01234567890123456789| -//|Measured skew: N/A | -//|--------------------| -//|Slight skew: 0.12d| -//|Severe skew: 0.25d| -//---------------------- float angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW)); lcd_home(); lcd_printf_P(_N( @@ -3062,10 +3169,10 @@ static void lcd_menu_xyz_skew() "%S: %5.2f\x01\n" "%S: %5.2f\x01" ), - _i("Measured skew"), + _i("Measured skew"), ////c=13 r=1 separator, - _i("Slight skew"), _deg(bed_skew_angle_mild), - _i("Severe skew"), _deg(bed_skew_angle_extreme) + _i("Slight skew"), _deg(bed_skew_angle_mild), ////c=13 r=1 c=4 r=1 + _i("Severe skew"), _deg(bed_skew_angle_extreme) ////c=13 r=1 c=4 r=1 ); if (angleDiff < 100){ lcd_set_cursor(15,0); @@ -3078,22 +3185,23 @@ static void lcd_menu_xyz_skew() if (lcd_clicked()) menu_goto(lcd_menu_xyz_offset, 0, true, true); } -/** - * @brief Show measured bed offset from expected position - */ +//! @brief Show measured bed offset from expected position +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |[0;0] point offset | c=20 r=1 +//! | -------------- | STR_SEPARATOR +//! |X: 000.00mm| c=10 r=1 +//! |Y: 000.00mm| c=10 r=1 +//! ---------------------- +//! @endcode static void lcd_menu_xyz_offset() { -//|01234567890123456789| -//|[0;0] point offset | c=20 -//|--------------------| -//|X: 000.00mm| c=10 -//|Y: 000.00mm| c=10 -//---------------------- lcd_set_cursor(0,0); lcd_puts_P(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET lcd_puts_at_P(0, 1, separator); - lcd_puts_at_P(0, 2, PSTR("X")); - lcd_puts_at_P(0, 3, PSTR("Y")); + lcd_puts_at_P(0, 2, PSTR("X")); ////c=10 r=1 + lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10 r=1 float vec_x[2]; float vec_y[2]; @@ -3252,6 +3360,18 @@ void lcd_adjust_bed_reset(void) _md->status = 0; } +//! @brief Show Bed level correct +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Settings: | MSG_SETTINGS +//! |Left side [um]: | MSG_BED_CORRECTION_LEFT +//! |Right side[um]: | MSG_BED_CORRECTION_RIGHT +//! |Front side[um]: | MSG_BED_CORRECTION_FRONT +//! |Rear side [um]: | MSG_BED_CORRECTION_REAR +//! |Reset | MSG_BED_CORRECTION_RESET +//! ---------------------- +//! @endcode void lcd_adjust_bed(void) { _menu_data_adjust_bed_t* _md = (_menu_data_adjust_bed_t*)&(menu_data[0]); @@ -3289,6 +3409,16 @@ void lcd_adjust_bed(void) MENU_END(); } +//! @brief Show PID Extruder +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! | Set temperature: | MSG_SET_TEMPERATURE +//! | | +//! | 210 | +//! | | +//! ---------------------- +//! @endcode void pid_extruder() { lcd_clear(); From 3eb36ca194edd7e4a020869663cb534c6ba53ec1 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 23 Aug 2019 16:48:30 +0200 Subject: [PATCH 036/190] 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 37b6388d05..74a8b90a5c 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 037/190] 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 10c5437edd..79cdba1a24 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 6c81db2966..13185f179c 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 038/190] 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 870eee89ae..ebda496086 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 039/190] 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 79cdba1a24..5279776d5f 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 040/190] Fix formatting. --- Firmware/ultralcd.cpp | 217 +++++++++++++++++++++--------------------- 1 file changed, 109 insertions(+), 108 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e601fd7557..58995ddc35 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 041/190] 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 58995ddc35..31af3e8cb2 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 f414a1cc12..516a31356c 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 042/190] Fix formatting. --- Firmware/ultralcd.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 31af3e8cb2..1dc094d7ef 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 043/190] 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 1dc094d7ef..a307a174e8 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 044/190] Fix formatting. --- Firmware/ultralcd.cpp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a307a174e8..dc4c97d37a 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 045/190] 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 dc4c97d37a..e8fb8524b7 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 046/190] 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 e8fb8524b7..49e54c493b 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 fbbc332dac..997ab3d460 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 d0d0341cac..80616763e7 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 c931b7db0a..ad95d1178a 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 c5df948c24..b43a1674cd 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 cc2498d632..5765c1c7ab 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 b2b2661719..d55d63862f 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 5736b632f5..ce7318cafa 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 047/190] 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 5279776d5f..a034f94ead 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 be04ab1a22..b9e881ef25 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 048/190] 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 e601fd7557..43ab404267 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 049/190] 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 bdd32ec83a..90f3e72348 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 e601fd7557..12010ff39e 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 050/190] 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 870eee89ae..e456b24158 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 951302877b..dd77c91c61 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 10c5437edd..1aa435cfe6 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5880,7 +5880,6 @@ SERIAL_PROTOCOLPGM("\n\n"); { setTargetHotendSafe(code_value(), extruder); } - setWatch(); break; } @@ -6025,7 +6024,6 @@ SERIAL_PROTOCOLPGM("\n\n"); } #endif - setWatch(); codenum = _millis(); /* See if we are heating up or cooling down */ diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 391607e8ce..3c7f5fbc48 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 e9ba11b47d..7f4daa2e4c 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 49e54c493b..8127730f33 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 051/190] Remove commented out code. --- Firmware/ultralcd.cpp | 104 ------------------------------------------ 1 file changed, 104 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8127730f33..f0ce1de175 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 052/190] 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 f0ce1de175..8d89024b2e 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 053/190] 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 8d89024b2e..b195315ec6 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 054/190] Fix compiler warnings. --- Firmware/ultralcd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b195315ec6..e79db0bac5 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 055/190] 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 e79db0bac5..87092b2c3d 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 056/190] Fix bad merge. --- Firmware/ultralcd.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dc721a1b25..87092b2c3d 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 057/190] 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 12010ff39e..0df9d9a069 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 058/190] 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 43ab404267..bb2540db8e 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 059/190] 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 582cea348a..0da565f169 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 060/190] 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 bb2540db8e..9fba0039a7 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 061/190] 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 9fba0039a7..ac3c53c08b 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 062/190] 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 ac3c53c08b..4c4314444f 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 063/190] 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 4c4314444f..3296ce5568 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 064/190] 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 | 80 ++++++++++++++++--------------------------- 4 files changed, 56 insertions(+), 69 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 0da565f169..625e079eaf 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 94314ddd44..10080c0737 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 c41fb9ff95..23c812afe6 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 3296ce5568..b3d202c519 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(); } -void lcd_hw_setup_menu(void) // can not be "static" +template +static void select_sheet_menu() { -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)); - -//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); + selected_sheet = number; + lcd_sheet_menu(); +} -//delete(b); +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(); +} -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); +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 -SETTINGS_NOZZLE; -MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); + MENU_ITEM_SUBMENU_P(_i("Steel sheets"), sheets_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 065/190] 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 10080c0737..758bac6dcc 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 066/190] Document --- Firmware/eeprom.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 23c812afe6..732cddffd5 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 067/190] 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 7839bbdc06..1b3830a79a 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 d9bbf876cc..c07fe98486 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 b3d202c519..f4fe1ee139 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 068/190] 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 f4fe1ee139..f0abdc4d92 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 069/190] 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 f0abdc4d92..96ec847da4 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 070/190] 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 860d761cf5..96ec5d668b 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 071/190] Fix typo --- Firmware/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 96ec5d668b..8e8716eb83 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 072/190] 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 758bac6dcc..ed10fdcd1c 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 073/190] 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 8e8716eb83..5b102f42b1 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 074/190] 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 1b3830a79a..7aad723cff 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 075/190] 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 ed10fdcd1c..60b5c946b5 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 732cddffd5..482ddf932c 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 96ec847da4..6f49f9250b 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 076/190] 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 6f49f9250b..f1334551ee 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 077/190] 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 60b5c946b5..dd1a410b1d 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 d51b3d6207d0336abc4d92a0fdd31e305f0cd11e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 1 Sep 2019 09:51:51 +0200 Subject: [PATCH 078/190] Added doxygen todos for missing LCD layout and positioning --- Firmware/ultralcd.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4a19132871..2cceda418e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1,4 +1,7 @@ //! @file +//! @date Aug 28, 2019 +//! @author mkbel +//! @brief LCD #include "temperature.h" #include "ultralcd.h" @@ -1782,6 +1785,7 @@ static void lcd_cooldown() //! |Int: 000 Shut: 000 | Int: c=4 r=1 Shut: c=4 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") { int fan_speed_RPM[2]; @@ -1862,6 +1866,7 @@ static void lcd_menu_fails_stats_mmu() //! | | //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_mmu_print() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1882,6 +1887,7 @@ static void lcd_menu_fails_stats_mmu_print() //! | MMU power fails:000| c=14 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_mmu_total() { mmu_command(MmuCmd::S3); @@ -1904,6 +1910,7 @@ static void lcd_menu_fails_stats_mmu_total() //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_total() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1926,6 +1933,7 @@ static void lcd_menu_fails_stats_total() //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats_print() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -1978,6 +1986,7 @@ static void lcd_menu_fails_stats() //! | Filam. runouts: 000| c=14 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_fails_stats() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -2015,6 +2024,7 @@ extern char* __malloc_heap_end; //! | heap_end: 0000| c=14 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_debug() { #ifdef DEBUG_STACK_MONITOR @@ -2037,6 +2047,7 @@ static void lcd_menu_debug() //! ---------------------- //! D - Degree sysmbol LCD_STR_DEGREE //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_temperatures() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -2066,7 +2077,7 @@ static void lcd_menu_temperatures() //! | | //! ---------------------- //! @endcode - +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_voltages() { lcd_timeoutToStatus.stop(); //infinite timeout @@ -2089,6 +2100,7 @@ static void lcd_menu_voltages() //! | | //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_belt_status() { lcd_home(); @@ -2981,6 +2993,7 @@ if(0) //! | 00d :00h :00 m | //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. Translations missing for "d"days, "h"ours, "m"inutes", "s"seconds". void lcd_menu_statistics() { if (IS_SD_PRINTING) @@ -3107,7 +3120,6 @@ static void lcd_move_e() //! @brief Show measured Y distance of front calibration points from Y_MIN_POS //! If those points are detected too close to edge of reachable area, their confidence is lowered. //! This functionality is applied more often for MK2 printers. - //! @code{.unparsed} //! |01234567890123456789| //! |Y distance from min | c=19 r=1 @@ -3116,6 +3128,7 @@ static void lcd_move_e() //! |Right: 00.00mm | c=11 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_xyz_y_min() { float distanceMin[2]; @@ -3159,6 +3172,7 @@ float _deg(float rad) //! ---------------------- //! D - Degree sysmbol LCD_STR_DEGREE //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_xyz_skew() { float angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW)); @@ -3195,6 +3209,7 @@ static void lcd_menu_xyz_skew() //! |Y: 000.00mm| c=10 r=1 //! ---------------------- //! @endcode +//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_xyz_offset() { lcd_set_cursor(0,0); From 3a5daf1c64e889951703176be2a958ef030b27e7 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 5 Sep 2019 17:27:21 +0200 Subject: [PATCH 079/190] 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 dd1a410b1d..b33b2c3ca4 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 080/190] 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 a034f94ead..447cc08252 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 081/190] 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 | 968 +++++++++++++++++---------------- lang/po/Firmware_cs.po | 1054 +++++++++++++++++++----------------- lang/po/Firmware_de.po | 1065 +++++++++++++++++++----------------- lang/po/Firmware_es.po | 1058 +++++++++++++++++++----------------- lang/po/Firmware_fr.po | 1166 +++++++++++++++++++++------------------- 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, 8870 insertions(+), 5144 deletions(-) diff --git a/lang/lang-export.sh b/lang/lang-export.sh index 4fa6bc5982..ab123dbe8a 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 6176e053f0..092afb9811 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 2da37fc06f..272c800c8c 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 ed682e8126..4b6f9b171b 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 cb73f8f264..70ca591c0b 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 a48da96f55..b624457eab 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 320b91d9ef..243a50e5a5 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 0b82c587fb..f18114e9ee 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 47e0fbb06d..65e016519a 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 d61a746f22..d2e5bfd165 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." +#: ultralcd.cpp:3807 +msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" +# +#: ultralcd.cpp:2968 +msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:3684 -msgid "XYZ calibration failed. Right front calibration point not reachable." +#: ultralcd.cpp:5045 +msgid "Y-correct:" msgstr "" -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" msgstr "" # -#: ultralcd.cpp:2859 -msgid "Y distance from min" +#: messages.c:57 +msgid "Back" msgstr "" # -#: ultralcd.cpp:4886 -msgid "Y-correct" +#: ultralcd.cpp:5553 +msgid "Checks" msgstr "" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" +# +#: 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 "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" +# +#: 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 3a1ab88586..c9130c600e 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 "" + +# +#: 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?" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Zavest filament 5" +# +#: 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 77166d4929..6107cef80d 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 "" + +# +#: 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 "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Filament 5 laden" +# +#: 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 1a5d09a1dd..9262867e23 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 "" + +# +#: 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" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Cargar filamento 5" +# +#: 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 a11e2e738c..dea1b4c294 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 connecte" +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." +#: ultralcd.cpp:3807 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Charger fil. 2" +# +#: ultralcd.cpp:2968 +msgid "Y distance from min" +msgstr "Distance Y du min" # -#: ultralcd.cpp:3684 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant droite n'est pas atteignable." +#: ultralcd.cpp:5045 +msgid "Y-correct:" +msgstr "Correct-Y:" -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Charger fil. 3" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" # -#: ultralcd.cpp:2859 -msgid "Y distance from min" -msgstr "Distance Y du min" +#: messages.c:57 +msgid "Back" +msgstr "" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correction-Y" +#: ultralcd.cpp:5553 +msgid "Checks" +msgstr "" -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Charger fil. 4" +# +#: 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 "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Charger fil. 5" +# +#: 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 b2b78e7f0c..852e024abe 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 "" + +# +#: 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 "" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Caricare fil. 5" +# +#: 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 540adfbfe2..d5a6794912 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 "" + +# +#: 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" -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Laduj filament 5" +# +#: 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 8547b2650f..79a932ba97 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:2290 +msgid "Preheating to cut" +msgstr "Predehrev k ustrizeni" + +# +#: ultralcd.cpp:2287 +msgid "Preheating to eject" +msgstr "Predehrev k vysunuti" # -#: ultralcd.cpp:2350 +#: 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 c5288b8390..110aea5eb8 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 9ceb0eefc5..8f4d21b54c 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 38ff850d0a..cd2975bc62 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 17a882485c..c226463bfb 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 5596bc2c97..e30df0e07e 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 082/190] 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 a712839b7f..57d7f66224 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 083/190] 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 70ca591c0b..08a114d84e 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 b624457eab..7b5bff84d9 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 243a50e5a5..82da96f9e6 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 084/190] 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 08a114d84e..3b771a2127 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 7b5bff84d9..77f3819bff 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 085/190] 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 57d7f66224..0473c3ff21 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 086/190] 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 77f3819bff..41d6fc3b04 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 087/190] 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 3b771a2127..a426c13a95 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 088/190] 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 41d6fc3b04..dd4db925ff 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 82da96f9e6..5c4f7e9d81 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 f18114e9ee..0ee9dbec9f 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 65e016519a..602775ff92 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 089/190] 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 4b6f9b171b..659a93723d 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 090/190] 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 ebda496086..04e7e85d89 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 091/190] Update Configuration.h --- Firmware/Configuration.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7a782d71c8..7f25771185 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 092/190] 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 ea1eb66d03..b9ea437139 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 093/190] 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 05657f053c..e6c30976ce 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 094/190] 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 887ef97ac5..bc1f2fa1e8 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 095/190] 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 5bdf3ac904..4e3a43f5bd 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 096/190] 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 8028514195..c8bc7c2ae8 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 097/190] 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 0c1518ad5f..62f001bd14 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 098/190] 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 d783c10f5d..b1072f9320 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 099/190] 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 0b96724d75..f6e9259adc 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 100/190] 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 1c408db840..027b13adc7 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 101/190] 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 fd3e1328f9..71948789bb 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 102/190] 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 307e9486c4..790c0a9550 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 103/190] 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 c39b52e646..607d028b51 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; From acb0341a1faa35a5ef731ad51c92a662ed06ddfd Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 11 Sep 2019 22:42:40 +0200 Subject: [PATCH 104/190] Do not set temperature in lay1cal_preheat(). --- Firmware/first_lay_cal.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 3ab34c41fc..aa338d2c09 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -14,28 +14,24 @@ void lay1cal_preheat() { static const char cmd_preheat_0[] PROGMEM = "M107"; - static const char cmd_preheat_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); - static const char cmd_preheat_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); - static const char cmd_preheat_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); - static const char cmd_preheat_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); - static const char cmd_preheat_5[] PROGMEM = "G28"; - static const char cmd_preheat_6[] PROGMEM = "G92 E0.0"; - - static const char * const preheat_cmd[] PROGMEM = + static const char cmd_preheat_1[] PROGMEM = "M190"; + static const char cmd_preheat_2[] PROGMEM = "M109"; + static const char cmd_preheat_4[] PROGMEM = "G28"; + static const char cmd_preheat_5[] PROGMEM = "G92 E0.0"; + + const char * const preheat_cmd[] = { cmd_preheat_0, cmd_preheat_1, cmd_preheat_2, - cmd_preheat_3, + _T(MSG_M117_V2_CALIBRATION), cmd_preheat_4, - cmd_preheat_5, //call MSG_M117_V2_CALIBRATION before - cmd_preheat_6, + cmd_preheat_5, }; for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) { - if (5 == i) enquecommand_P(_T(MSG_M117_V2_CALIBRATION)); - enquecommand_P(static_cast(pgm_read_ptr(&preheat_cmd[i]))); + enquecommand_P(preheat_cmd[i]); } } From 14dc6b86e05f537b6ffe9ce4bf190d6923000643 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 11 Sep 2019 23:37:09 +0200 Subject: [PATCH 105/190] Change undocumented behaviour of M190 (Wait for bed temperature). Document M190 and M109 (Wait for extruder temperature). Do not remember CooldownNoWait property set by M190 and M109. If M190 was invoked without parameters, CooldownNoWait property was set if it was previously set by "M109 S" or "M109 S" or printer was after power up. Otherwise CooldownNoWait was not set. Now CooldownNoWait is never set if M190 is invoked without parameters. Saves 44 B of FLASH memory. --- Firmware/Marlin_main.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 607d028b51..15014cf451 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -365,7 +365,6 @@ bool Stopped=false; Servo servos[NUM_SERVOS]; #endif -bool CooldownNoWait = true; bool target_direction; //Insert variables if CHDK is defined @@ -6006,6 +6005,14 @@ SERIAL_PROTOCOLPGM("\n\n"); } //! ### M109 - Wait for extruder temperature + //! Parameters (not mandatory): + //! * S \ set extruder temperature + //! * R \ set extruder temperature + //! + //! Parameters S and R are treated identically. + //! Command always waits for both cool down and heat up. + //! If no parameters are supplied waits for previously + //! set extruder temperature. // ------------------------------------------------- case 109: { @@ -6022,10 +6029,8 @@ SERIAL_PROTOCOLPGM("\n\n"); #endif if (code_seen('S')) { setTargetHotendSafe(code_value(), extruder); - CooldownNoWait = true; } else if (code_seen('R')) { setTargetHotendSafe(code_value(), extruder); - CooldownNoWait = false; } #ifdef AUTOTEMP if (code_seen('S')) autotemp_min=code_value(); @@ -6060,9 +6065,15 @@ SERIAL_PROTOCOLPGM("\n\n"); break; //! ### M190 - Wait for bed temperature - // --------------------------------------- + //! Parameters (not mandatory): + //! * S \ set extruder temperature and wait for heating + //! * R \ set extruder temperature and wait for heating or cooling + //! + //! If no parameter is supplied, waits for heating or cooling to previously set temperature. case 190: #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 + { + bool CooldownNoWait = false; LCD_MESSAGERPGM(_T(MSG_BED_HEATING)); heating_status = 3; if (farm_mode) { prusa_statistics(1); }; @@ -6074,7 +6085,6 @@ SERIAL_PROTOCOLPGM("\n\n"); else if (code_seen('R')) { setTargetBed(code_value()); - CooldownNoWait = false; } codenum = _millis(); @@ -6108,6 +6118,7 @@ SERIAL_PROTOCOLPGM("\n\n"); heating_status = 4; previous_millis_cmd = _millis(); + } #endif break; From ae3e6530e6f687a29db9431ee29637f0404e17ee Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 00:14:24 +0200 Subject: [PATCH 106/190] Do not ask for PLA filament in the beginning of first layer calibration. Do not ask if filament is present if it can be detected by IR sensor. --- Firmware/ultralcd.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ee8475d122..776540069e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4692,7 +4692,7 @@ void lcd_v2_calibration() { 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 + const uint8_t filament = choose_menu_P(_i("Select filament:"),_T(MSG_FILAMENT),_i("Cancel")); ////c=20 r=1 ////c=19 r=1 if (filament < 5) { lcd_commands_step = 20 + filament; @@ -4701,12 +4701,22 @@ void lcd_v2_calibration() } else { - bool loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is PLA filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2 + bool loaded = false; + if (fsensor_enabled && ir_sensor_detected) + { + loaded = (digitalRead(IR_SENSOR_PIN) == 0); + } + else + { + loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2 + } + + if (loaded) { lcd_commands_type = LcdCommands::Layer1Cal; } else { - lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 + lcd_display_message_fullscreen_P(_i("Please load filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_consume_click(); for (uint_least8_t i = 0; i < 20; i++) { //wait max. 2s delay_keep_alive(100); From 43705aae2e43c1a196b3100d272a08c88c3c544f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 00:19:20 +0200 Subject: [PATCH 107/190] Rename lay1cal_preheat() to lay1cal_wait_preheat(). --- Firmware/first_lay_cal.cpp | 4 ++-- Firmware/first_lay_cal.h | 2 +- Firmware/ultralcd.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index aa338d2c09..a6b5f109f7 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -10,8 +10,8 @@ #include "mmu.h" #include -//! @brief Preheat -void lay1cal_preheat() +//! @brief Wait for preheat +void lay1cal_wait_preheat() { static const char cmd_preheat_0[] PROGMEM = "M107"; static const char cmd_preheat_1[] PROGMEM = "M190"; diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index a52bef76c0..d3d72004ec 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -6,7 +6,7 @@ #define FIRMWARE_FIRST_LAY_CAL_H_ #include -void lay1cal_preheat(); +void lay1cal_wait_preheat(); void lay1cal_load_filament(char *cmd_buffer, uint8_t filament); void lay1cal_intro_line(); void lay1cal_before_meander(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 776540069e..5ad55b5d5b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1370,7 +1370,7 @@ void lcd_commands() lcd_commands_step = 11; break; case 11: - lay1cal_preheat(); + lay1cal_wait_preheat(); lcd_commands_step = 10; break; case 10: From 78708903e83dfa0f9353e8a2083731b158281249 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 12 Sep 2019 07:16:31 +0300 Subject: [PATCH 108/190] Also update eeprom value --- Firmware/stepper.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 5b102f42b1..e75251577b 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1563,7 +1563,10 @@ 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 = 0; //set power to High Power (MK2.5) or Normal Power (MK3, unused) + if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused) + SilentMode = 0; + eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode); + } SilentModeMenu = SilentMode; #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); From 444daceca3c5f3e42bf73f1a488bc313535372cf Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 12 Sep 2019 13:39:04 +0300 Subject: [PATCH 109/190] Move define as requested --- Firmware/stepper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index e75251577b..710b135ec7 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1561,14 +1561,14 @@ void EEPROM_read_st(int pos, uint8_t* value, uint8_t size) void st_current_init() //Initialize Digipot Motor Current -{ +{ +#ifdef MOTOR_CURRENT_PWM_XY_PIN uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused) - SilentMode = 0; + SilentMode = SILENT_MODE_POWER; eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode); } SilentModeMenu = SilentMode; - #ifdef MOTOR_CURRENT_PWM_XY_PIN pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT); pinMode(MOTOR_CURRENT_PWM_E_PIN, OUTPUT); @@ -1590,7 +1590,7 @@ void st_current_init() //Initialize Digipot Motor Current st_current_set(2, motor_current_setting[2]); //Set timer5 to 31khz so the PWM of the motor power is as constant as possible. (removes a buzzing noise) TCCR5B = (TCCR5B & ~(_BV(CS50) | _BV(CS51) | _BV(CS52))) | _BV(CS50); - #endif +#endif } From 6674cbf0d76b7b09ef1de77e6d79c38b4060b017 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 17:54:05 +0200 Subject: [PATCH 110/190] Select material / temperature before first layer calibration. --- Firmware/ultralcd.cpp | 82 +++++++++++++++++++++++++------------------ Firmware/ultralcd.h | 1 + 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 883a48ecec..7b3f832efd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -95,6 +95,8 @@ uint8_t lcd_status_message_level; char lcd_status_message[LCD_WIDTH + 1] = ""; //////WELCOME! unsigned char firstrun = 1; +static uint8_t lay1cal_filament = 0; + static const char separator[] PROGMEM = "--------------------"; @@ -1338,7 +1340,6 @@ void lcd_commands() if (lcd_commands_type == LcdCommands::Layer1Cal) { char cmd1[30]; - static uint8_t filament = 0; 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 @@ -1349,32 +1350,12 @@ void lcd_commands() case 0: lcd_commands_step = 11; break; - case 20: - filament = 0; - lcd_commands_step = 11; - break; - case 21: - filament = 1; - lcd_commands_step = 11; - break; - case 22: - filament = 2; - lcd_commands_step = 11; - break; - case 23: - filament = 3; - lcd_commands_step = 11; - break; - case 24: - filament = 4; - lcd_commands_step = 11; - break; case 11: lay1cal_wait_preheat(); lcd_commands_step = 10; break; case 10: - lay1cal_load_filament(cmd1, filament); + lay1cal_load_filament(cmd1, lay1cal_filament); lcd_commands_step = 9; break; case 9: @@ -2113,6 +2094,7 @@ switch(eFilamentAction) case FilamentAction::MmuCut: case FilamentAction::None: case FilamentAction::Preheat: + case FilamentAction::Lay1Cal: break; } if(lcd_clicked()) @@ -2142,6 +2124,7 @@ if(lcd_clicked()) case FilamentAction::MmuCut: case FilamentAction::None: case FilamentAction::Preheat: + case FilamentAction::Lay1Cal: break; } } @@ -2158,9 +2141,9 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) setTargetHotend0((float )nTemp); if (!wizard_active) setTargetBed((float) nTempBed); - if (eFilamentAction == FilamentAction::Preheat) + if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) { - eFilamentAction = FilamentAction::None; + if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; lcd_return_to_status(); if (wizard_active) lcd_wizard(WizState::Unload); return; @@ -2218,6 +2201,8 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) break; case FilamentAction::None: case FilamentAction::Preheat: + case FilamentAction::Lay1Cal: + break; } if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); @@ -2248,6 +2233,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) break; case FilamentAction::None: case FilamentAction::Preheat: + case FilamentAction::Lay1Cal: break; } lcd_set_cursor(0, 3); @@ -2329,7 +2315,8 @@ void mFilamentBack() { menu_back(); if (eFilamentAction == FilamentAction::AutoLoad || - eFilamentAction == FilamentAction::Preheat) + eFilamentAction == FilamentAction::Preheat || + eFilamentAction == FilamentAction::Lay1Cal) { eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } @@ -2338,7 +2325,17 @@ void mFilamentBack() void mFilamentMenu() { MENU_BEGIN(); - if (!wizard_active) MENU_ITEM_FUNCTION_P(_T(MSG_MAIN),mFilamentBack); + if (!wizard_active) + { + if (eFilamentAction == FilamentAction::Lay1Cal) + { + MENU_ITEM_FUNCTION_P(_T(MSG_BACK), mFilamentBack); + } + else + { + MENU_ITEM_FUNCTION_P(_T(MSG_MAIN), mFilamentBack); + } + } if (farm_mode) { MENU_ITEM_FUNCTION_P(PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), mFilamentItem_farm); @@ -4519,8 +4516,13 @@ void lcd_v2_calibration() const uint8_t filament = choose_menu_P(_i("Select filament:"),_T(MSG_FILAMENT),_i("Cancel")); ////c=20 r=1 ////c=19 r=1 if (filament < 5) { - lcd_commands_step = 20 + filament; - lcd_commands_type = LcdCommands::Layer1Cal; + lay1cal_filament = filament; + } + else + { + menu_back(); + lcd_update_enable(true); + return; } } else @@ -4536,10 +4538,8 @@ void lcd_v2_calibration() } - if (loaded) { - lcd_commands_type = LcdCommands::Layer1Cal; - } - else { + if (!loaded) + { lcd_display_message_fullscreen_P(_i("Please load filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_consume_click(); for (uint_least8_t i = 0; i < 20; i++) { //wait max. 2s @@ -4548,9 +4548,14 @@ void lcd_v2_calibration() break; } } + menu_back(); + lcd_update_enable(true); + return; } } - lcd_return_to_status(); + + eFilamentAction = FilamentAction::Lay1Cal; + menu_goto(mFilamentMenu, 0, true, true); lcd_update_enable(true); } @@ -4811,6 +4816,7 @@ void lcd_wizard(WizState state) lcd_show_fullscreen_message_and_wait_P(_i("Now I will calibrate distance between tip of the nozzle and heatbed surface."));////MSG_WIZARD_V2_CAL c=20 r=8 lcd_show_fullscreen_message_and_wait_P(_i("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."));////MSG_WIZARD_V2_CAL_2 c=20 r=12 lcd_commands_type = LcdCommands::Layer1Cal; + lay1cal_filament = 0; lcd_return_to_status(); end = true; break; @@ -5493,7 +5499,10 @@ static void lcd_calibration_menu() if (!isPrintPaused) { MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1 - MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_v2_calibration); + if (lcd_commands_type == LcdCommands::Idle) + { + MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_v2_calibration); + } MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W")); MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST #ifdef MK1BP @@ -6427,7 +6436,10 @@ static void lcd_sheet_menu() MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 } - MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet); + if (lcd_commands_type == LcdCommands::Idle) + { + 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 diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 516a31356c..d5c6849faa 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -168,6 +168,7 @@ enum class FilamentAction : uint_least8_t MmuEject, MmuCut, Preheat, + Lay1Cal, }; extern FilamentAction eFilamentAction; From c26d7e50f77618f0af82e7f4834a2a4bda6adb95 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:07:46 +0200 Subject: [PATCH 111/190] Remove redundant lcd_update_enable(true) call. --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7b3f832efd..6c730b4be5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4521,7 +4521,6 @@ void lcd_v2_calibration() else { menu_back(); - lcd_update_enable(true); return; } } From e83b2ebe1f938dad4278ef7f5e403d7398df914b Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:15:15 +0200 Subject: [PATCH 112/190] Rename mFilamentMenu to lcd_generic_preheat_menu to match naming convention for global function and be more descriptive. --- Firmware/Marlin_main.cpp | 2 +- Firmware/mmu.cpp | 2 +- Firmware/ultralcd.cpp | 16 ++++++++-------- Firmware/ultralcd.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9413df868f..c9eadd4eaf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8526,7 +8526,7 @@ if(0) } else { - menu_submenu(mFilamentMenu); + menu_submenu(lcd_generic_preheat_menu); lcd_timeoutToStatus.start(); } } diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index e7a59e75ca..89c76dd26a 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1092,7 +1092,7 @@ else { mFilamentItem(target_temperature[0],target_temperature_bed); } // else menu_submenu(mFilamentMenu); - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6c730b4be5..6c80d2136a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1915,7 +1915,7 @@ static void lcd_menu_test_restore() static void lcd_preheat_menu() { eFilamentAction = FilamentAction::Preheat; - mFilamentMenu(); + lcd_generic_preheat_menu(); } static void lcd_support_menu() @@ -2322,7 +2322,7 @@ void mFilamentBack() } } -void mFilamentMenu() +void lcd_generic_preheat_menu() { MENU_BEGIN(); if (!wizard_active) @@ -2377,7 +2377,7 @@ else { bFilamentPreheatState=true; mFilamentItem(target_temperature[0],target_temperature_bed); } - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } @@ -2615,7 +2615,7 @@ if(0) bFilamentPreheatState=true; mFilamentItem(target_temperature[0],target_temperature_bed); } - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } @@ -4554,7 +4554,7 @@ void lcd_v2_calibration() } eFilamentAction = FilamentAction::Lay1Cal; - menu_goto(mFilamentMenu, 0, true, true); + menu_goto(lcd_generic_preheat_menu, 0, true, true); lcd_update_enable(true); } @@ -5954,7 +5954,7 @@ static void mmu_load_to_nozzle_menu() bFilamentPreheatState = true; mFilamentItem(target_temperature[0], target_temperature_bed); } - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } @@ -5986,7 +5986,7 @@ static void mmu_fil_eject_menu() bFilamentPreheatState = true; mFilamentItem(target_temperature[0], target_temperature_bed); } - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } @@ -6014,7 +6014,7 @@ static void mmu_cut_filament_menu() bFilamentPreheatState=true; mFilamentItem(target_temperature[0],target_temperature_bed); } - else mFilamentMenu(); + else lcd_generic_preheat_menu(); } } #endif //MMU_HAS_CUTTER diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index d5c6849faa..5882bd2a76 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -177,7 +177,7 @@ extern bool bFilamentPreheatState; extern bool bFilamentAction; void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItemForce(); -void mFilamentMenu(); +void lcd_generic_preheat_menu(); void unload_filament(); void stack_error(); From 0cdfa7a5e8e75d210f8fcfab1bab6de5a5862bb8 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:33:02 +0200 Subject: [PATCH 113/190] Remove dead code. --- Firmware/mmu.cpp | 25 ++++++++----------------- Firmware/ultralcd.cpp | 37 ++++++++----------------------------- 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 89c76dd26a..e08ddd3240 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1077,23 +1077,14 @@ void mmu_filament_ramming() //-// void extr_unload_() { -//if(bFilamentAction) -if(0) - { - bFilamentAction=false; - extr_unload(); - } -else { - eFilamentAction=FilamentAction::MmuUnLoad; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } -// else menu_submenu(mFilamentMenu); - else lcd_generic_preheat_menu(); - } + eFilamentAction = FilamentAction::MmuUnLoad; + bFilamentFirstRun = false; + if (target_temperature[0] >= EXTRUDE_MINTEMP) + { + bFilamentPreheatState = true; + mFilamentItem(target_temperature[0], target_temperature_bed); + } + else lcd_generic_preheat_menu(); } //! @brief show which filament is currently unloaded diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6c80d2136a..c01991cb9f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2363,13 +2363,6 @@ mFilamentItem(target_temperature[0],target_temperature_bed); void lcd_unLoadFilament() { -//./if((degHotend0()>EXTRUDE_MINTEMP)&&bFilamentFirstRun) -if(0) - { - menu_back(); - enquecommand_P(PSTR("M702")); // unload filament - } -else { eFilamentAction=FilamentAction::UnLoad; bFilamentFirstRun=false; if(target_temperature[0]>=EXTRUDE_MINTEMP) @@ -2378,7 +2371,6 @@ else { mFilamentItem(target_temperature[0],target_temperature_bed); } else lcd_generic_preheat_menu(); - } } @@ -2596,27 +2588,14 @@ static void lcd_menu_AutoLoadFilament() static void lcd_LoadFilament() { -//-// if (degHotend0() > EXTRUDE_MINTEMP) -if(0) - { -// menu_back(); // not necessary (see "lcd_return_to_status()" below) - custom_message_type = CustomMsg::FilamentLoading; - loading_flag = true; - enquecommand_P(PSTR("M701")); //load filament - SERIAL_ECHOLN("Loading filament"); - lcd_return_to_status(); - } - else - { - eFilamentAction=FilamentAction::Load; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } - else lcd_generic_preheat_menu(); - } + eFilamentAction = FilamentAction::Load; + bFilamentFirstRun = false; + if (target_temperature[0] >= EXTRUDE_MINTEMP) + { + bFilamentPreheatState = true; + mFilamentItem(target_temperature[0], target_temperature_bed); + } + else lcd_generic_preheat_menu(); } From 3a541488b2bb179d1eb7286781c83e1695d7254c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:40:02 +0200 Subject: [PATCH 114/190] Rename extr_unload_() to mmu_unload_filament() and move it to ultralcd.cpp as it is menu. --- Firmware/mmu.cpp | 12 ------------ Firmware/mmu.h | 3 +-- Firmware/ultralcd.cpp | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index e08ddd3240..d8ae497baa 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1074,18 +1074,6 @@ void mmu_filament_ramming() } } -//-// -void extr_unload_() -{ - eFilamentAction = FilamentAction::MmuUnLoad; - bFilamentFirstRun = false; - if (target_temperature[0] >= EXTRUDE_MINTEMP) - { - bFilamentPreheatState = true; - mFilamentItem(target_temperature[0], target_temperature_bed); - } - else lcd_generic_preheat_menu(); -} //! @brief show which filament is currently unloaded void extr_unload_view() diff --git a/Firmware/mmu.h b/Firmware/mmu.h index 0f8784ba72..ad508c2ada 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -105,8 +105,7 @@ extern int get_ext_nr(); extern void display_loading(); extern void extr_adj(uint8_t extruder); extern void extr_unload(); -//-// -extern void extr_unload_(); + extern void extr_adj_0(); extern void extr_adj_1(); extern void extr_adj_2(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c01991cb9f..b5769a146b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -131,6 +131,8 @@ static void lcd_menu_fails_stats_mmu_print(); static void lcd_menu_fails_stats_mmu_total(); //static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") +static void mmu_unload_filament(); + static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); #ifdef MMU_HAS_CUTTER @@ -2373,6 +2375,18 @@ void lcd_unLoadFilament() else lcd_generic_preheat_menu(); } +static void mmu_unload_filament() +{ + eFilamentAction = FilamentAction::MmuUnLoad; + bFilamentFirstRun = false; + if (target_temperature[0] >= EXTRUDE_MINTEMP) + { + bFilamentPreheatState = true; + mFilamentItem(target_temperature[0], target_temperature_bed); + } + else lcd_generic_preheat_menu(); +} + void lcd_wait_interact() { @@ -6543,7 +6557,7 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu); //-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload); //bFilamentFirstRun=true; - MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), extr_unload_); + MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu); #ifdef MMU_HAS_CUTTER MENU_ITEM_SUBMENU_P(_i("Cut filament"), mmu_cut_filament_menu); From d80b8280a06b079a3bbc57ed214b524d94fed2a7 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:41:17 +0200 Subject: [PATCH 115/190] Remove commented out and unused functions prototypes. --- Firmware/ultralcd.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b5769a146b..c53f3d17b4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -122,17 +122,13 @@ static void prusa_stat_diameter(); static void prusa_stat_temperatures(); static void prusa_stat_printinfo(); static void lcd_farm_no(); -//static void lcd_menu_extruder_info(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") static void lcd_menu_xyz_y_min(); static void lcd_menu_xyz_skew(); static void lcd_menu_xyz_offset(); static void lcd_menu_fails_stats_mmu(); static void lcd_menu_fails_stats_mmu_print(); static void lcd_menu_fails_stats_mmu_total(); -//static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") - static void mmu_unload_filament(); - static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); #ifdef MMU_HAS_CUTTER From 770e470fd5e04026a50f8adef4139a6c7f32289c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:53:24 +0200 Subject: [PATCH 116/190] Extract common code to function preheat_or_continue(). Saves 138B of FLASH memory. --- Firmware/ultralcd.cpp | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c53f3d17b4..e7e8212072 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -131,6 +131,8 @@ static void lcd_menu_fails_stats_mmu_total(); static void mmu_unload_filament(); static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); +static void preheat_or_continue(); + #ifdef MMU_HAS_CUTTER static void mmu_cut_filament_menu(); #endif //MMU_HAS_CUTTER @@ -2362,25 +2364,13 @@ mFilamentItem(target_temperature[0],target_temperature_bed); void lcd_unLoadFilament() { eFilamentAction=FilamentAction::UnLoad; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } - else lcd_generic_preheat_menu(); + preheat_or_continue(); } static void mmu_unload_filament() { eFilamentAction = FilamentAction::MmuUnLoad; - bFilamentFirstRun = false; - if (target_temperature[0] >= EXTRUDE_MINTEMP) - { - bFilamentPreheatState = true; - mFilamentItem(target_temperature[0], target_temperature_bed); - } - else lcd_generic_preheat_menu(); + preheat_or_continue(); } @@ -2596,9 +2586,8 @@ static void lcd_menu_AutoLoadFilament() } #endif //FILAMENT_SENSOR -static void lcd_LoadFilament() +static void preheat_or_continue() { - eFilamentAction = FilamentAction::Load; bFilamentFirstRun = false; if (target_temperature[0] >= EXTRUDE_MINTEMP) { @@ -2608,6 +2597,12 @@ static void lcd_LoadFilament() else lcd_generic_preheat_menu(); } +static void lcd_LoadFilament() +{ + eFilamentAction = FilamentAction::Load; + preheat_or_continue(); +} + //! @brief Show filament used a print time //! @@ -5937,13 +5932,7 @@ static void mmu_load_to_nozzle_menu() else { eFilamentAction = FilamentAction::MmuLoad; - bFilamentFirstRun = false; - if (target_temperature[0] >= EXTRUDE_MINTEMP) - { - bFilamentPreheatState = true; - mFilamentItem(target_temperature[0], target_temperature_bed); - } - else lcd_generic_preheat_menu(); + preheat_or_continue(); } } @@ -5969,13 +5958,7 @@ static void mmu_fil_eject_menu() else { eFilamentAction = FilamentAction::MmuEject; - bFilamentFirstRun = false; - if (target_temperature[0] >= EXTRUDE_MINTEMP) - { - bFilamentPreheatState = true; - mFilamentItem(target_temperature[0], target_temperature_bed); - } - else lcd_generic_preheat_menu(); + preheat_or_continue(); } } From d48197656cd83c9def94e5c8e9cde5f5f46b43b0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 20:05:16 +0200 Subject: [PATCH 117/190] Fix lcd_v2_calibration menu not redrawn after full screen message or question. --- Firmware/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e7e8212072..b8af0360aa 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4518,6 +4518,8 @@ void lcd_v2_calibration() else { loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2 + lcd_update_enabled = true; + } @@ -4531,15 +4533,14 @@ void lcd_v2_calibration() break; } } + lcd_update_enabled = true; menu_back(); - lcd_update_enable(true); return; } } eFilamentAction = FilamentAction::Lay1Cal; menu_goto(lcd_generic_preheat_menu, 0, true, true); - lcd_update_enable(true); } void lcd_wizard() { From 6630591f9e61bb47fc374756c6ade41cba8976dc Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 20:20:33 +0200 Subject: [PATCH 118/190] Consume lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P(). This fixes problem encountered in lcd_v2_calibration(). Selected menu item skips to another if returning to menu after this message is used. --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b8af0360aa..8cd7eb0e04 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3591,6 +3591,7 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow if (lcd_clicked()) { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); KEEPALIVE_STATE(IN_HANDLER); + lcd_encoder_diff = 0; return yes; } } From 07a0f527d82fb85b7799fe85a28a0fcb8ea66f4e Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 20:30:27 +0200 Subject: [PATCH 119/190] Reset lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P() also when it times out. --- Firmware/ultralcd.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8cd7eb0e04..1918df2763 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3557,7 +3557,7 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow lcd_puts_P(PSTR(">")); lcd_puts_P(_T(MSG_NO)); } - bool yes = default_yes ? true : false; + int8_t retval = default_yes ? true : false; // Wait for user confirmation or a timeout. unsigned long previous_millis_cmd = _millis(); @@ -3566,24 +3566,27 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow KEEPALIVE_STATE(PAUSED_FOR_USER); for (;;) { if (allow_timeouting && _millis() - previous_millis_cmd > LCD_TIMEOUT_TO_STATUS) - return -1; + { + retval = -1; + break; + } manage_heater(); manage_inactivity(true); if (abs(enc_dif - lcd_encoder_diff) > 4) { lcd_set_cursor(0, 2); - if (enc_dif < lcd_encoder_diff && yes) { + if (enc_dif < lcd_encoder_diff && retval) { lcd_puts_P((PSTR(" "))); lcd_set_cursor(0, 3); lcd_puts_P((PSTR(">"))); - yes = false; + retval = 0; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } - else if (enc_dif > lcd_encoder_diff && !yes) { + else if (enc_dif > lcd_encoder_diff && !retval) { lcd_puts_P((PSTR(">"))); lcd_set_cursor(0, 3); lcd_puts_P((PSTR(" "))); - yes = true; + retval = 1; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } enc_dif = lcd_encoder_diff; @@ -3591,10 +3594,11 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow if (lcd_clicked()) { Sound_MakeSound(e_SOUND_TYPE_ButtonEcho); KEEPALIVE_STATE(IN_HANDLER); - lcd_encoder_diff = 0; - return yes; + break; } } + lcd_encoder_diff = 0; + return retval; } void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, uint8_t point_too_far_mask) From 73642632f54444490e2a3cd52520f3b4c18c6a97 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 22:37:28 +0200 Subject: [PATCH 120/190] Do not force PLA filament in first layer calibration from wizard. Remove duplicate variable wizard_active. Saves 410 B of FLASH and 1 B of RAM. --- Firmware/Marlin.h | 2 - Firmware/Marlin_main.cpp | 4 +- Firmware/ultralcd.cpp | 86 ++++++++++------------------------------ Firmware/ultralcd.h | 1 - lang/lang_en.txt | 24 ----------- lang/lang_en_cz.txt | 32 --------------- lang/lang_en_de.txt | 32 --------------- lang/lang_en_es.txt | 32 --------------- lang/lang_en_fr.txt | 32 --------------- lang/lang_en_it.txt | 32 --------------- lang/lang_en_pl.txt | 32 --------------- 11 files changed, 22 insertions(+), 287 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 625e079eaf..6098731faf 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -391,8 +391,6 @@ extern uint16_t print_time_remaining_silent; extern uint16_t mcode_in_progress; extern uint16_t gcode_in_progress; -extern bool wizard_active; //autoload temporarily disabled during wizard - extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c9eadd4eaf..ad81a061e9 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -323,8 +323,6 @@ uint16_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated re uint8_t print_percent_done_silent = PRINT_PERCENT_DONE_INIT; uint16_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes -bool wizard_active = false; //autoload temporarily disabled during wizard - //=========================================================================== //=============================Private Variables============================= //=========================================================================== @@ -8495,7 +8493,7 @@ bool bInhibitFlag; #endif // IR_SENSOR if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active { - if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && !wizard_active) + if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { if (fsensor_check_autoload()) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1918df2763..d944ae1fe9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2139,13 +2139,13 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nTargetOld = target_temperature[0]; nTargetBedOld = target_temperature_bed; setTargetHotend0((float )nTemp); - if (!wizard_active) setTargetBed((float) nTempBed); + if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) setTargetBed((float) nTempBed); if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) { if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; lcd_return_to_status(); - if (wizard_active) lcd_wizard(WizState::Unload); + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) lcd_wizard(WizState::LoadFil); return; } @@ -2325,7 +2325,7 @@ void mFilamentBack() void lcd_generic_preheat_menu() { MENU_BEGIN(); - if (!wizard_active) + if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { if (eFilamentAction == FilamentAction::Lay1Cal) { @@ -2351,7 +2351,7 @@ void lcd_generic_preheat_menu() 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); + if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && eFilamentAction == FilamentAction::Preheat) MENU_ITEM_FUNCTION_P(_T(MSG_COOLDOWN), lcd_cooldown); MENU_END(); } @@ -4602,38 +4602,16 @@ static void wait_preheat() } -static void lcd_wizard_unload() -{ - if(mmu_enabled) - { - int8_t unload = lcd_show_multiscreen_message_two_choices_and_wait_P( - _i("Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube.") - ,false, true, _i("Unload"), _i("Eject")); - if (unload) - { - extr_unload_0(); - } - else - { - mmu_eject_filament(0, true); - } - } - else - { - unload_filament(); - } -} - 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 + lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the first tube of MMU, then press the knob to load it."));////c=20 r=8 tmp_extruder = 0; } else { - lcd_show_fullscreen_message_and_wait_P(_i("Please insert PLA filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8 + lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8 } lcd_update_enable(false); lcd_clear(); @@ -4657,18 +4635,12 @@ bool lcd_autoDepleteEnabled() //! //! @startuml //! [*] --> IsFil -//! IsFil : Is filament 1 loaded? -//! isPLA : Is filament 1 PLA? -//! unload : Eject or Unload? -//! load : Push the button to start loading PLA Filament 1 +//! IsFil : Is any filament loaded? +//! load : Push the button to start loading Filament 1 //! -//! IsFil --> isPLA : yes +//! IsFil --> calibration : yes //! IsFil --> load : no -//! isPLA --> unload : no -//! unload --> load : eject -//! unload --> load : unload //! load --> calibration : click -//! isPLA --> calibration : yes //! @enduml //! //! @param state Entry point of the wizard @@ -4699,7 +4671,6 @@ void lcd_wizard(WizState state) // 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) { state = S::Restore; @@ -4749,7 +4720,7 @@ void lcd_wizard(WizState state) lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); wait_preheat(); //unload current filament - lcd_wizard_unload(); + unload_filament(); //load filament lcd_wizard_load(); setTargetHotend(0, 0); //we are finished, cooldown nozzle @@ -4763,51 +4734,37 @@ void lcd_wizard(WizState state) setTargetBed(PLA_PREHEAT_HPB_TEMP); if (mmu_enabled) { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament 1 loaded?"), false);////c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is any filament loaded?"), false);////c=20 r=2 } else { wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 } - if (wizard_event) state = S::IsPla; + if (wizard_event) state = S::Lay1Cal; else { if(mmu_enabled) state = S::LoadFil; - else state = S::PreheatPla; + else state = S::Preheat; } break; - case S::PreheatPla: -#ifndef SNMM - lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA."));////MSG_WIZARD_WILL_PREHEAT c=20 r=4 - wait_preheat(); -#endif //not SNMM - state = S::LoadFil; - break; case S::Preheat: menu_goto(lcd_preheat_menu,0,false,true); lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material.")); end = true; // Leave wizard temporarily for lcd_preheat_menu break; - case S::Unload: - wait_preheat(); - lcd_wizard_unload(); - state = S::LoadFil; - break; case S::LoadFil: //load filament + wait_preheat(); lcd_wizard_load(); state = S::Lay1Cal; break; - case S::IsPla: - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is it PLA filament?"), false, true);////MSG_WIZARD_PLA_FILAMENT c=20 r=2 - if (wizard_event) state = S::Lay1Cal; - else state = S::Preheat; - break; case S::Lay1Cal: lcd_show_fullscreen_message_and_wait_P(_i("Now I will calibrate distance between tip of the nozzle and heatbed surface."));////MSG_WIZARD_V2_CAL c=20 r=8 - lcd_show_fullscreen_message_and_wait_P(_i("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."));////MSG_WIZARD_V2_CAL_2 c=20 r=12 - lcd_commands_type = LcdCommands::Layer1Cal; - lay1cal_filament = 0; - lcd_return_to_status(); - end = true; + if(mmu_enabled) + { + lcd_show_fullscreen_message_and_wait_P(_i("First you will select filament you wish to use for calibration.")); + } + lcd_show_fullscreen_message_and_wait_P(_i("Select temperature which matches your material. Then 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."));////MSG_WIZARD_V2_CAL_2 c=20 r=12 + menu_goto(lcd_v2_calibration,0,false,true); + end = true; // Leave wizard temporarily for lcd_v2_calibration break; case S::RepeatLay1Cal: //repeat first layer cal.? wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 @@ -4853,7 +4810,6 @@ void lcd_wizard(WizState state) } if (!((S::Lay1Cal == state) || (S::Preheat == state))) { lcd_show_fullscreen_message_and_wait_P(msg); - wizard_active = false; } lcd_update_enable(true); lcd_update(2); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 5882bd2a76..15e0d3da4c 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -231,7 +231,6 @@ enum class WizState : uint8_t IsFil, //!< Is filament loaded? Entry point for 1st layer calibration PreheatPla, //!< waiting for preheat nozzle for PLA Preheat, //!< Preheat for any material - Unload, //!< Unload filament LoadFil, //!< Load filament IsPla, //!< Is PLA filament? Lay1Cal, //!< First layer calibration diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 272c800c8c..286b82e824 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -166,9 +166,6 @@ #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" -# -"Eject" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" @@ -346,27 +343,15 @@ #MSG_WIZARD_Z_CAL c=20 r=8 "I will run z calibration now." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." - #MSG_WATCH "Info screen" -# -"Is filament 1 loaded?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" #MSG_WIZARD_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" @@ -547,12 +532,6 @@ #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." -#MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -"Please insert PLA filament to the extruder, then press knob to load it." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." @@ -562,9 +541,6 @@ #MSG_PRESS_TO_UNLOAD c=20 r=4 "Please press the knob to unload filament" -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." - #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 659a93723d..2edd1172df 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -222,10 +222,6 @@ "Eject filament" "Vysunout filament" -# -"Eject" -"Vysunout" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Vysouvam filament" @@ -462,18 +458,10 @@ "I will run z calibration now." "Nyni provedu z kalibraci." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"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_WATCH "Info screen" "Informace" -# -"Is filament 1 loaded?" -"Je filament 1 zaveden?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Vlozte filament" @@ -482,14 +470,6 @@ "Is filament loaded?" "Je filament zaveden?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"Je to PLA filament?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"Je PLA filament zaveden?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "Je tiskovy plat na podlozce?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny." -#MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -"Please insert PLA filament to the extruder, then press knob to load it." -"Prosim vlozte PLA filament do extruderu, pote stisknete tlacitko pro zavedeni filamentu." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." -"Nejdrive prosim zavedte PLA filament." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Prosim otevrete idler a manualne odstrante filament." @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Pro vysunuti filamentu stisknete prosim tlacitko" -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"Prosim vlozte PLA filament do trubicky MMU, pote stisknete tlacitko pro zavedeni filamentu." - #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" "Prosim vyjmete urychlene filament" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index a426c13a95..6ead0ffffc 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -222,10 +222,6 @@ "Eject filament" "Filamentauswurf" -# -"Eject" -"Auswurf" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "werfe Filament aus" @@ -462,18 +458,10 @@ "I will run z calibration now." "Ich werde jetzt die Z Kalibrierung durchfuehren." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"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_WATCH "Info screen" "Infoanzeige" -# -"Is filament 1 loaded?" -"Wurde Filament 1 geladen?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Filament einlegen" @@ -482,14 +470,6 @@ "Is filament loaded?" "Ist das Filament geladen?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"Ist es wirklich PLA Filament?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"Ist PLA Filament geladen?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "Liegt das Stahlblech auf dem Heizbett?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "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 -"Please insert PLA filament to the extruder, then press knob to load it." -"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 -"Please load PLA filament first." -"Bitte laden Sie zuerst PLA Filament." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Bitte druecken Sie den Knopf um das Filament zu entladen." -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"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 "Please pull out filament immediately" "Bitte ziehen Sie das Filament sofort heraus" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index dd4db925ff..178716faea 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -222,10 +222,6 @@ "Eject filament" "Expulsar filamento" -# -"Eject" -"Expulsar" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Expulsando filamento" @@ -462,18 +458,10 @@ "I will run z calibration now." "Voy a hacer Calibracion Z ahora." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"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_WATCH "Info screen" "Monitorizar" -# -"Is filament 1 loaded?" -"?Esta cargado el filamento 1?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Introducir filamento" @@ -482,14 +470,6 @@ "Is filament loaded?" "Esta el filamento cargado?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"Es el filamento PLA?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"Esta el filamento PLA cargado?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "?Esta colocada la lamina de acero sobre la base?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" -#MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -"Please insert PLA filament to the extruder, then press knob to load it." -"Inserta, por favor, filamento PLA en el extrusor. Despues haz clic para cargarlo." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." -"Carga el filamento PLA primero por favor." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Por favor, pulsa el dial para descargar el filamento" -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"Por favor introduce el filamento al primer tubo MMU, despues presiona el dial para imprimirlo." - #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" "Por favor retire el filamento de inmediato" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 5c4f7e9d81..9064b09b22 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -222,10 +222,6 @@ "Eject filament" "Ejecter le fil." -# -"Eject" -"Ejecter" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Ejection filament" @@ -462,18 +458,10 @@ "I will run z calibration now." "Je vais maintenant lancer la calibration z." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"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 "Info screen" "Ecran d'info" -# -"Is filament 1 loaded?" -"Le filament 1 est-il charge ?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Inserez le filament" @@ -482,14 +470,6 @@ "Is filament loaded?" "Le filament est-il charge ?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"Est-ce du filament PLA ?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"Le filament PLA est-il charge ?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "Feuille d'acier sur plateau chauffant ?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "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 -"Please insert PLA filament to the extruder, then press knob to load it." -"Inserez du filament PLA dans l'extrudeur puis appuyez sur le bouton pour le charger." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." -"Chargez d'abord le filament PLA." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Ouvrez l'idler et retirez le filament manuellement." @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Appuyez sur le bouton pour decharger le filament" -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"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 "Please pull out filament immediately" "Retirez immediatement le filament" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0ee9dbec9f..9733183ff9 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -222,10 +222,6 @@ "Eject filament" "Espelli filamento " -# -"Eject" -"Espellere" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Espellendo filamento " @@ -462,18 +458,10 @@ "I will run z calibration now." "Adesso avviero la Calibrazione Z." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"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_WATCH "Info screen" "Schermata info" -# -"Is filament 1 loaded?" -"Il filamento 1 e caricato?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Inserire filamento" @@ -482,14 +470,6 @@ "Is filament loaded?" "Il filamento e stato caricato?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"E' un filamento di PLA?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"E' stato caricato il filamento di PLA?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "La piastra d'acciaio e sul piano riscaldato?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "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 -"Please insert PLA filament to the extruder, then press knob to load it." -"Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." -"Per favore prima carica il filamento di PLA." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Aprire la guida filam. e rimuovere il filam. a mano" @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Premete la manopola per scaricare il filamento " -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"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 "Please pull out filament immediately" "Estrarre il filamento immediatamente" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 602775ff92..93a91e8b34 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -222,10 +222,6 @@ "Eject filament" "Wysun filament" -# -"Eject" -"Wysun" - #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Wysuwanie filamentu" @@ -462,18 +458,10 @@ "I will run z calibration now." "Przeprowadze kalibracje Z." -#MSG_WIZARD_V2_CAL_2 c=20 r=12 -"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." -"Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" - #MSG_WATCH "Info screen" "Ekran informacyjny" -# -"Is filament 1 loaded?" -"Filament 1 zaladowany?" - #MSG_INSERT_FILAMENT c=20 "Insert filament" "Wprowadz filament" @@ -482,14 +470,6 @@ "Is filament loaded?" "Filament jest zaladowany?" -#MSG_WIZARD_PLA_FILAMENT c=20 r=2 -"Is it PLA filament?" -"Czy to filament PLA?" - -#MSG_PLA_FILAMENT_LOADED c=20 r=2 -"Is PLA filament loaded?" -"Fialment PLA jest zaladowany?" - #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" "Czy plyta stal. jest na podgrzew. stole?" @@ -730,14 +710,6 @@ "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." -#MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -"Please insert PLA filament to the extruder, then press knob to load it." -"Umiesc filament PLA w ekstruderze i nacisnij pokretlo, aby zaladowac." - -#MSG_PLEASE_LOAD_PLA c=20 r=4 -"Please load PLA filament first." -"Najpierw zaladuj filament PLA." - #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." @@ -750,10 +722,6 @@ "Please press the knob to unload filament" "Nacisnij pokretlo aby rozladowac filament" -# -"Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"Wsun filament PLA do pierwszej rurki MMU i nacisnij pokretlo aby go zaladowac." - #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" "Wyciagnij filament teraz" From d256c186355cbe4ed3faf4694f31357e849c98fb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 23:17:19 +0200 Subject: [PATCH 121/190] Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed. --- Firmware/ultralcd.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d944ae1fe9..0e08222904 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2139,13 +2139,19 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nTargetOld = target_temperature[0]; nTargetBedOld = target_temperature_bed; setTargetHotend0((float )nTemp); - if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) setTargetBed((float) nTempBed); + + if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) || + eFilamentAction == FilamentAction::Lay1Cal) + { + setTargetBed((float) nTempBed); + } if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) { if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; lcd_return_to_status(); - if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) lcd_wizard(WizState::LoadFil); + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && + eFilamentAction == FilamentAction::Preheat) lcd_wizard(WizState::LoadFil); return; } From ebf405d58979d1e69451c295afdb8982595a2be9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 23:20:03 +0200 Subject: [PATCH 122/190] Preselect "yes" for filament question in first layer calibration wizard. --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0e08222904..562b61f868 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4740,10 +4740,10 @@ void lcd_wizard(WizState state) setTargetBed(PLA_PREHEAT_HPB_TEMP); if (mmu_enabled) { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is any filament loaded?"), false);////c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is any filament loaded?"), true);////c=20 r=2 } else { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 } if (wizard_event) state = S::Lay1Cal; else From f1d190d2d5fa20871d13afb6004b31f016182e56 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 23:41:42 +0200 Subject: [PATCH 123/190] Do not ask same filament related question twice if starting first layer calibration from wizard. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 562b61f868..da22eca220 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4519,7 +4519,7 @@ void lcd_v2_calibration() return; } } - else + else if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { bool loaded = false; if (fsensor_enabled && ir_sensor_detected) From e754780717a7ab2d3b6b5653ee7d1943e520b247 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 13 Sep 2019 00:19:37 +0200 Subject: [PATCH 124/190] Fix condition for returning to wizard. eFilamentAction == FilamentAction::Preheat was never true as eFilamentAction is set to eFilamentAction::None in lcd_return_to_status(). --- Firmware/ultralcd.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index da22eca220..4d9d4c41b4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1617,7 +1617,7 @@ void lcd_return_to_status() lcd_refresh(); // to maybe revive the LCD if static electricity killed it. menu_goto(lcd_status_screen, 0, false, true); menu_depth = 0; - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad + eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } //! @brief Pause print, disable nozzle heater, move to park position @@ -2146,13 +2146,21 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) setTargetBed((float) nTempBed); } - if (eFilamentAction == FilamentAction::Preheat || eFilamentAction == FilamentAction::Lay1Cal) { - if (eFilamentAction == FilamentAction::Lay1Cal) lcd_commands_type = LcdCommands::Layer1Cal; - lcd_return_to_status(); - if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) && - eFilamentAction == FilamentAction::Preheat) lcd_wizard(WizState::LoadFil); - return; + const FilamentAction action = eFilamentAction; + if (action == FilamentAction::Preheat || action == FilamentAction::Lay1Cal) + { + lcd_return_to_status(); + if (action == FilamentAction::Lay1Cal) + { + lcd_commands_type = LcdCommands::Layer1Cal; + } + else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) + { + lcd_wizard(WizState::LoadFil); + } + return; + } } lcd_timeoutToStatus.stop(); From 4423106fadabea90e42484209c0e477602eed140 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 13 Sep 2019 16:55:05 +0200 Subject: [PATCH 125/190] dialogs' layouts fixes (support menu dlgs, statistics etc.) French translation polished --- Firmware/menu.cpp | 2 +- Firmware/ultralcd.cpp | 111 +++++++++++--------- lang/lang_en.txt | 7 +- lang/lang_en_cz.txt | 20 ++-- lang/lang_en_de.txt | 8 +- lang/lang_en_es.txt | 10 +- lang/lang_en_fr.txt | 235 +++++++++++++++++++++--------------------- lang/lang_en_it.txt | 8 +- lang/lang_en_pl.txt | 8 +- 9 files changed, 217 insertions(+), 192 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 7aad723cff..bb721dba98 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -423,7 +423,7 @@ void menu_draw_P(char chr, const char* str, int16_t val) float factor = 1.0f + static_cast(val) / 1000.0f; if (val <= _md->minEditValue) { - lcd_printf_P(menu_fmt_float13off, chr, str, " [off]"); + lcd_printf_P(menu_fmt_float13off, chr, str, _i(" [off]")); } else { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0abdf1b597..26d78b645b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1670,6 +1670,24 @@ static void lcd_cooldown() lcd_return_to_status(); } +//! @brief append text label with a colon and format it into a fixed size output buffer +//! It would have been much easier if there was a ':' in the labels. +//! But since the texts like Bed, Nozzle and PINDA are used in other places +//! it is better to reuse these texts even though it requires some extra formatting code. +static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize){ + uint8_t i = 0; + for(; i < dstSize - 2; ++i){ // 1 byte less than buffer, we'd be adding a ':' to the end + uint8_t b = pgm_read_byte(ipgmLabel + i); + if( ! b ) + break; + dst[i] = b; + } + dst[i] = ':'; // append the colon + ++i; + for(; i < dstSize - 1; ++i) // fill the rest with spaces + dst[i] = ' '; + dst[dstSize-1] = 0; // terminate the string properly +} void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") { @@ -1679,23 +1697,14 @@ void lcd_menu_extruder_info() // NOT static due to using ins //|Fil. Xd: Yd: | //|Int: Shut: | //---------------------- - int fan_speed_RPM[2]; - // Display Nozzle fan RPM - fan_speed_RPM[0] = 60*fan_speed[0]; - fan_speed_RPM[1] = 60*fan_speed[1]; - lcd_timeoutToStatus.stop(); //infinite timeout - - lcd_home(); - lcd_printf_P(_N( - "%S: %4d RPM\n" - "%S: %4d RPM\n" - ), - _i("Nozzle FAN"), - fan_speed_RPM[0], - _i("Print FAN"), - fan_speed_RPM[1] - ); + // Display Nozzle fan RPM + lcd_timeoutToStatus.stop(); //infinite timeout + lcd_home(); + char nozzle[12], print[12]; + pgmtext_with_colon(_i("Nozzle FAN"), nozzle, 12); + pgmtext_with_colon(_i("Print FAN"), print, 12); + lcd_printf_P(_N("%s %4d RPM\n" "%s %4d RPM\n"), nozzle, 60*fan_speed[0], print, 60*fan_speed[1] ); #ifdef PAT9125 // Display X and Y difference from Filament sensor @@ -1745,12 +1754,12 @@ static void lcd_menu_fails_stats_mmu_print() // MMU load fails 000 // ////////////////////// - lcd_timeoutToStatus.stop(); //infinite timeout + lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); - lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d"), _i("Last print failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails); - menu_back_if_clicked_fb(); + lcd_home(); + lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Last print failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails); + menu_back_if_clicked_fb(); } static void lcd_menu_fails_stats_mmu_total() @@ -1761,16 +1770,17 @@ static void lcd_menu_fails_stats_mmu_total() // MMU load fails 000 // ////////////////////// - mmu_command(MmuCmd::S3); - lcd_timeoutToStatus.stop(); //infinite timeout + mmu_command(MmuCmd::S3); + lcd_timeoutToStatus.stop(); //infinite timeout uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL_TOT); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL_TOT); - lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S %-3d"), _i("Total failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails, _i("MMU power fails"), mmu_power_failures); - menu_back_if_clicked_fb(); + lcd_home(); + lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Total failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails, _i("MMU power fails"), mmu_power_failures); + menu_back_if_clicked_fb(); } #if defined(TMC2130) && defined(FILAMENT_SENSOR) +static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-7.7SX %-3d Y %-3d"; static void lcd_menu_fails_stats_total() { //01234567890123456789 @@ -1779,14 +1789,14 @@ static void lcd_menu_fails_stats_total() // Filam. runouts 000 // Crash X 000 Y 000 ////////////////////// - lcd_timeoutToStatus.stop(); //infinite timeout + lcd_timeoutToStatus.stop(); //infinite timeout uint16_t power = eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT); uint16_t filam = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); uint16_t crashX = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT); uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); - lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); - menu_back_if_clicked_fb(); + lcd_home(); + lcd_printf_P(failStatsFmt, _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); + menu_back_if_clicked_fb(); } static void lcd_menu_fails_stats_print() @@ -1797,14 +1807,14 @@ static void lcd_menu_fails_stats_print() // Filam. runouts 000 // Crash X 000 Y 000 ////////////////////// - lcd_timeoutToStatus.stop(); //infinite timeout + lcd_timeoutToStatus.stop(); //infinite timeout uint8_t power = eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT); uint8_t filam = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint8_t crashX = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_X); uint8_t crashY = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_Y); - lcd_home(); - lcd_printf_P(PSTR("%S\n" " %S %-3d\n" " %S %-3d\n" " %S X %-3d Y %-3d"), _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); - menu_back_if_clicked_fb(); + lcd_home(); + lcd_printf_P(failStatsFmt, _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); + menu_back_if_clicked_fb(); } /** @@ -1877,16 +1887,23 @@ static void lcd_menu_debug() } #endif /* DEBUG_BUILD */ +//! @brief common line print for lcd_menu_temperatures +static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){ + char tmp[15]; + pgmtext_with_colon(ipgmLabel, tmp, 15); + lcd_printf_P(PSTR(" %s%3d\x01 \n"), tmp, value); // no need to add -14.14 to string alignment +} static void lcd_menu_temperatures() { - lcd_timeoutToStatus.stop(); //infinite timeout - lcd_home(); - lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); + lcd_timeoutToStatus.stop(); //infinite timeout + lcd_home(); + lcd_menu_temperatures_line( _T(MSG_NOZZLE), (int)current_temperature[0] ); + lcd_menu_temperatures_line( _T(MSG_BED), (int)current_temperature_bed ); #ifdef AMBIENT_THERMISTOR - lcd_printf_P(PSTR(" %S: %d%c\n" " PINDA: %d%c"), _i("Ambient"), (int)current_temperature_ambient, '\x01', (int)current_temperature_pinda, '\x01'); -#else //AMBIENT_THERMISTOR - lcd_printf_P(PSTR(" PINDA: %d%c"), (int)current_temperature_pinda, '\x01'); -#endif //AMBIENT_THERMISTOR + lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); +#endif + lcd_menu_temperatures_line( _i("PINDA"), (int)current_temperature_pinda ); + menu_back_if_clicked(); } @@ -2659,7 +2676,7 @@ void lcd_menu_statistics() lcd_clear(); lcd_printf_P(_N( "%S:\n" - "%8.2fm\n" + "%17.2fm \n" "%S:\n" "%2dh %02dm %02ds" ),_i("Filament used"), _met, _i("Print time"), _h, _m, _s); @@ -2681,7 +2698,7 @@ void lcd_menu_statistics() lcd_clear(); lcd_printf_P(_N( "%S:\n" - "%8.2fm\n" + "%17.2fm \n" "%S:\n" "%7ldd :%2hhdh :%02hhdm" ), _i("Total filament"), _filament_m, _i("Total print time"), _days, _hours, _minutes); @@ -2823,17 +2840,17 @@ static void lcd_menu_xyz_skew() lcd_printf_P(_N( "%S:\n" "%S\n" - "%S: %5.2f\x01\n" - "%S: %5.2f\x01" + "%-15.15S%3.2f\x01\n" + "%-15.15S%3.2f\x01" ), _i("Measured skew"), separator, - _i("Slight skew"), _deg(bed_skew_angle_mild), - _i("Severe skew"), _deg(bed_skew_angle_extreme) + _i("Slight skew:"), _deg(bed_skew_angle_mild), + _i("Severe skew:"), _deg(bed_skew_angle_extreme) ); if (angleDiff < 100){ lcd_set_cursor(15,0); - lcd_printf_P(_N("%4.2f\x01"), _deg(angleDiff)); + lcd_printf_P(_N("%3.2f\x01"), _deg(angleDiff)); } else{ lcd_set_cursor(15,0); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 272c800c8c..a39ae94b4f 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -734,7 +734,7 @@ "Sort [time]" # -"Severe skew" +"Severe skew:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -746,7 +746,7 @@ "Sound [loud]" # -"Slight skew" +"Slight skew:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" @@ -1074,3 +1074,6 @@ # "Z-probe nr. [3]" + +# +"Z-probe nr. [5]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 659a93723d..8d8bed552a 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -92,7 +92,7 @@ #MSG_BED_HEATING "Bed Heating" -"Zahrivani bed" +"Zahrivani bedu" #MSG_BED_CORRECTION_MENU "Bed level correct" @@ -508,7 +508,7 @@ # "Left" -"Vlevo:" +"Vlevo" #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Tryska V." +"Vent. trysky" #MSG_PAUSE_PRINT "Pause print" @@ -819,8 +819,8 @@ "Predehrev k vyjmuti" #MSG_SELFTEST_PRINT_FAN_SPEED c=18 -"Print fan:" -"Tiskovy v:" +"Print fan" +"Tiskovy vent." #MSG_CARD_MENU "Print from SD" @@ -844,7 +844,7 @@ # "Print FAN" -"Tiskovy v" +"Tiskovy vent." #MSG_PRUSA3D "prusa3d.com" @@ -979,8 +979,8 @@ "Trideni [cas]" # -"Severe skew" -"Tezke zkoseni" +"Severe skew:" +"Tezke zkoseni:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Zvuk [hlasity]" # -"Slight skew" -"Lehke zkoseni" +"Slight skew:" +"Lehke zkoseni:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index a426c13a95..00d48eca65 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -979,8 +979,8 @@ "Sort. [Zeit]" # -"Severe skew" -"Schwer.Schr" +"Severe skew:" +"Schwer.Schr:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Sound [laut]" # -"Slight skew" -"Leicht.Schr" +"Slight skew:" +"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 dd4db925ff..bcf3794aba 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -979,8 +979,8 @@ "Ordenar [tiempo]" # -"Severe skew" -"Incl.severa" +"Severe skew:" +"Incl.severa:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Sonido [alto]" # -"Slight skew" -"Liger.incl." +"Slight skew:" +"Liger.incl.:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" @@ -1240,7 +1240,7 @@ #MSG_OFF " [off]" -" [apagado]" +"[apag]" # "Back" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 5c4f7e9d81..3f53ff9ab4 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -16,7 +16,7 @@ #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" +"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre" # ">Cancel" @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajuster Z :" +"Ajuster Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -32,7 +32,7 @@ #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" -"Tout est pret. Bonne impression !" +"Tout est pret. Bonne impression!" # "Ambient" @@ -62,9 +62,9 @@ "Auto home" "Mise a 0 des axes" -#MSG_AUTOLOAD_FILAMENT c=17 +#MSG_AUTOLOAD_FILAMENT c=18 "AutoLoad filament" -"AutoCharge du filament" +"Autocharge du fil." #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -"Chargement auto du filament actif, appuyez sur le btn et inserez le fil." +"Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." #MSG_SELFTEST_AXIS_LENGTH "Axis length" @@ -100,7 +100,7 @@ #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -"Echec bed leveling. Capt. non declenche. Debris sur buse ? En attente d'un reset." +"Echec bed leveling. Capt. non declenche. Debris sur buse? En attente d'un reset." #MSG_BED "Bed" @@ -112,7 +112,7 @@ #MSG_RECOVER_PRINT c=20 r=2 "Blackout occurred. Recover print?" -"Coupure detectee. Recup. impression ?" +"Coupure detectee. Reprendre impression?" # "Calibrating home" @@ -132,7 +132,7 @@ #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." -"Calibration de XYZ. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." +"Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." #MSG_CALIBRATE_Z_AUTO c=20 r=2 "Calibrating Z" @@ -140,7 +140,7 @@ #MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." -"Calibration de Z. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." +"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." #MSG_HOMEYZ_DONE "Calibration done" @@ -168,7 +168,7 @@ # "Copy selected language?" -"Copier la langue selectionne ?" +"Copier la langue selectionne?" #MSG_CRASHDETECT_ON "Crash det. [on]" @@ -188,7 +188,7 @@ # "Crash detected. Resume print?" -"Crash detecte. Poursuivre l'impression ?" +"Crash detecte. Poursuivre l'impression?" # "Crash" @@ -200,7 +200,7 @@ #MSG_DATE c=17 r=1 "Date:" -"Date :" +"Date:" #MSG_DISABLE_STEPPERS "Disable steppers" @@ -212,7 +212,7 @@ #MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -"Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant ?" +"Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant?" #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" @@ -220,15 +220,15 @@ #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" -"Ejecter le fil." +"Remonter le fil." # "Eject" -"Ejecter" +"Remonter" #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" -"Ejection filament" +"Le fil. remonte" #MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 "Endstop not hit" @@ -248,11 +248,11 @@ #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." -"ERREUR : Le capteur de filament ne repond pas, verifiez le branchement." +"ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." #MSG_ERROR "ERROR:" -"ERREUR :" +"ERREUR:" #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" @@ -268,23 +268,23 @@ # "Fail stats MMU" -"Stat. echecs MMU" +"Stat. d'echec MMU" #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"ChargAuto f. [on]" +"Autochargeur [on]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"AutoCharg F [N/A]" +"Autochargeur[N/A]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"AutoCharg F [off]" +"Autochargeur[off]" # "Fail stats" -"Statist. d'echec" +"Stat. d'echec" #MSG_FAN_SPEED c=14 "Fan speed" @@ -292,15 +292,15 @@ #MSG_SELFTEST_FAN c=20 "Fan test" -"Test ventilateur" +"Test du ventilateur" #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Verif ventilo[on]" +"Verif vent. [on]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Verif venti [off]" +"Verif vent. [off]" #MSG_FSENSOR_ON "Fil. sensor [on]" @@ -308,7 +308,7 @@ #MSG_FSENSOR_NA "Fil. sensor [N/A]" -"Capteur Fil. [N/A]" +"Capteur Fil.[N/A]" #MSG_FSENSOR_OFF "Fil. sensor [off]" @@ -320,7 +320,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Filament extrude et avec bonne couleur ?" +"Filament extrude et avec bonne couleur?" #MSG_NOT_LOADED c=19 "Filament not loaded" @@ -340,11 +340,11 @@ #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" -"Fichier incomplet. Continuer qd meme ?" +"Fichier incomplet. Continuer qd meme?" #MSG_FINISHING_MOVEMENTS c=20 r=1 "Finishing movements" -"Mouvements de fin" +"Mouvement final" #MSG_V2_CALIBRATION c=17 r=1 "First layer cal." @@ -352,11 +352,11 @@ #MSG_WIZARD_SELFTEST c=20 r=8 "First, I will run the selftest to check most common assembly problems." -"D'abord, je vais lancer le Selftest pour verifier les problemes d'assemblage les plus communs." +"D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." # "Fix the issue and then press button on MMU unit." -"Corrigez le probleme et appuyez sur le bouton de l'unite MMU." +"Corrigez le probleme et appuyez sur le bouton sur la MMU." #MSG_FLOW "Flow" @@ -368,7 +368,7 @@ #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" -"Ventilo impr avant ?" +"Ventilo impr avant?" #MSG_BED_CORRECTION_FRONT c=14 r=1 "Front side[um]" @@ -384,7 +384,7 @@ #MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." -"Chauffe desactivee par le compteur de securite." +"Chauffage desactivee par le compteur de securite." #MSG_HEATING_COMPLETE c=20 "Heating done." @@ -396,7 +396,7 @@ #MSG_WIZARD_WELCOME c=20 r=7 "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" -"Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation ?" +"Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation?" #MSG_PRUSA3D_HOWTO "howto.prusa3d.com" @@ -420,11 +420,11 @@ #MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" -"Verifications butees" +"Verification butees" #MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " -"Verif. tete impr." +"Verif. du hotend" #MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " @@ -444,11 +444,11 @@ #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" -"Choisir extrudeur :" +"Choisir extrudeur:" #MSG_CHOOSE_FILAMENT c=20 r=1 "Choose filament:" -"Choix du filament :" +"Choix du filament:" #MSG_FILAMENT c=17 r=1 "Filament" @@ -456,11 +456,11 @@ #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." -"Je vais maintenant lancer la calibration xyz. Cela prendra 12 min environ." +"Je vais maintenant lancer la calibration XYZ. Cela prendra 12 min environ." #MSG_WIZARD_Z_CAL c=20 r=8 "I will run z calibration now." -"Je vais maintenant lancer la calibration z." +"Je vais maintenant lancer la calibration Z." #MSG_WIZARD_V2_CAL_2 c=20 r=12 "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." @@ -472,7 +472,7 @@ # "Is filament 1 loaded?" -"Le filament 1 est-il charge ?" +"Fil.1 est-il charge?" #MSG_INSERT_FILAMENT c=20 "Insert filament" @@ -480,27 +480,27 @@ #MSG_WIZARD_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" -"Le filament est-il charge ?" +"Fil. est-il charge?" #MSG_WIZARD_PLA_FILAMENT c=20 r=2 "Is it PLA filament?" -"Est-ce du filament PLA ?" +"Est-ce du filament PLA?" #MSG_PLA_FILAMENT_LOADED c=20 r=2 "Is PLA filament loaded?" -"Le filament PLA est-il charge ?" +"Fil. PLA est-il charge?" #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -"Feuille d'acier sur plateau chauffant ?" +"Plaque d'impression sur le lit chauffant?" # "Last print failures" -"Echecs derniere impr" +"Echecs derniere imp." # "Last print" -"Derniere impression" +"Derniere impres." #MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" @@ -520,7 +520,7 @@ #MSG_BABYSTEP_Z "Live adjust Z" -"Ajuster Z en direct" +"Ajuster Z en dir." #MSG_LOAD_FILAMENT c=17 "Load filament" @@ -528,11 +528,11 @@ #MSG_LOADING_COLOR "Loading color" -"Chargement couleur" +"Charg. de la couleur" #MSG_LOADING_FILAMENT c=20 "Loading filament" -"Chargement filament" +"Chargement du fil." #MSG_LOOSE_PULLEY c=20 r=1 "Loose pulley" @@ -540,7 +540,7 @@ # "Load to nozzle" -"Charger dans la buse" +"Charger la buse" #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." @@ -548,7 +548,7 @@ #MSG_MAIN "Main" -"Principal" +"Menu principal" #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" @@ -564,15 +564,15 @@ #MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 "MMU OK. Resuming temperature..." -"MMU OK. Remontee en temperature..." +"MMU OK. Rechauffage de la buse..." # "Measured skew" -"Deviation mesuree" +"Deviat.mesuree" # "MMU fails" -"Echec MMU" +"Echecs MMU" # "MMU load failed " @@ -592,7 +592,7 @@ #MSG_SILENT_MODE_ON "Mode [silent]" -"Mode [silencieux]" +"Mode [feutre]" # "MMU needs user attention." @@ -604,7 +604,7 @@ #MSG_STEALTH_MODE_ON "Mode [Stealth]" -"Mode [Furtif]" +"Mode [furtif]" #MSG_AUTO_MODE_ON "Mode [auto power]" @@ -684,7 +684,7 @@ # "Now remove the test print from steel sheet." -"Retirez maintenant l'impression de test de la feuille d'acier." +"Retirez maintenant l'impression de test de la plaque en acier." # "Nozzle FAN" @@ -716,7 +716,7 @@ #MSG_WIZARD_CLEAN_HEATBED c=20 r=8 "Please clean heatbed and then press the knob." -"Nettoyez le plateau chauffant et appuyez sur le bouton." +"Nettoyez la plaque en acier et appuyez sur le bouton." #MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 "Please clean the nozzle for calibration. Click when done." @@ -724,11 +724,11 @@ #MSG_SELFTEST_PLEASECHECK "Please check :" -"Verifiez :" +"Verifiez:" #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." -"Merci de verifier notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." +"Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." #MSG_WIZARD_LOAD_FILAMENT c=20 r=8 "Please insert PLA filament to the extruder, then press knob to load it." @@ -744,7 +744,7 @@ #MSG_PLACE_STEEL_SHEET c=20 r=4 "Please place steel sheet on heatbed." -"Placez la feuille d'acier sur le plateau chauffant." +"Placez la plaque en acier sur le plateau chauffant." #MSG_PRESS_TO_UNLOAD c=20 r=4 "Please press the knob to unload filament" @@ -752,7 +752,7 @@ # "Please insert PLA filament to the first tube of MMU, then press the knob to load it." -"Veuillez inserer du filament PLA dans le premier tube du MMU, et pressez sur le bouton pour le charger." +"Inserez du PLA dans le 1er tube du MMU, appuyez sur le bouton pour le charger." #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" @@ -764,7 +764,7 @@ #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." -"Retirez la feuille d'acier du plateau chauffant." +"Retirez la plaque en acier du plateau chauffant." #MSG_RUN_XYZ c=20 r=4 "Please run XYZ calibration first." @@ -780,7 +780,7 @@ # "Please remove shipping helpers first." -"Veuillez retirer d'abord les protections d'envoi." +"Retirez d'abord les protections de transport." #MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" @@ -810,21 +810,21 @@ "Print aborted" "Impression annulee" -# +# c=20 r=1 "Preheating to load" "Chauffe pour charger" -# +# c=20 r=1 "Preheating to unload" -"Chauffe pr decharger" +"Chauf.pour decharger" #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Vent.impr:" +"Vent. impr:" #MSG_CARD_MENU "Print from SD" -"Impr depuis la SD" +"Impr. depuis la SD" # "Press the knob" @@ -836,7 +836,7 @@ # "Press the knob to resume nozzle temperature." -"Appuyez sur le bouton pour poursuivre la mise en temperature de la buse." +"Appuyez sur le bouton pour rechauffer la buse." #MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." @@ -844,7 +844,7 @@ # "Print FAN" -"Vent.impr" +"Vent. impr" #MSG_PRUSA3D "prusa3d.com" @@ -868,7 +868,7 @@ #MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -"Reinit.calibr. XYZ" +"Reinit. calib. XYZ" #MSG_BED_CORRECTION_RESET "Reset" @@ -896,7 +896,7 @@ #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" -"Lancer l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer ?" +"Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" @@ -904,7 +904,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [flshAir]" -"CarteSD[flashAir]" +"CarteSD [flshAir]" # "Right" @@ -932,7 +932,7 @@ #MSG_SELFTEST_ERROR "Selftest error !" -"Erreur auto-test !" +"Erreur auto-test!" #MSG_SELFTEST_FAILED c=20 "Selftest failed " @@ -948,11 +948,11 @@ # "Select PLA filament:" -"Selectionnez le filament PLA :" +"Selectionnez le fil. PLA:" #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" -"Regler temp. :" +"Regler temp.:" #MSG_SETTINGS "Settings" @@ -979,8 +979,8 @@ "Tri [heure]" # -"Severe skew" -"Deviat.sev." +"Severe skew:" +"Deviat.sev.:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Son [fort]" # -"Slight skew" -"Deviat.leg." +"Slight skew:" +"Deviat.leg.:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" @@ -1004,7 +1004,7 @@ # "Some problem encountered, Z-leveling enforced ..." -"Problemes rencontres, nivellement de l'axe Z applique..." +"Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" @@ -1012,7 +1012,7 @@ #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -"Son [silencieux]" +"Son [feutre]" #MSG_SPEED "Speed" @@ -1080,7 +1080,7 @@ #MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -"Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." +"Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # "Total filament" @@ -1148,23 +1148,23 @@ # "Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube." -"Utilisez decharger pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube." +"Utilisez Remonter le fil. 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 "Warning: both printer type and motherboard type changed." -"Attention : Types d'imprimante et de carte mere modifies" +"Attention: Types d'imprimante et de carte mere modifies" #MSG_CHANGED_MOTHERBOARD c=20 r=4 "Warning: motherboard type changed." -"Attention : Type de carte mere modifie." +"Attention: Type de carte mere modifie." #MSG_CHANGED_PRINTER c=20 r=4 "Warning: printer type changed." -"Attention : Type d'imprimante modifie" +"Attention: Type d'imprimante modifie" #MSG_UNLOAD_SUCCESSFUL c=20 r=2 "Was filament unload successful?" -"Dechargement du filament reussi ?" +"Dechargement du filament reussi?" #MSG_SELFTEST_WIRINGERROR "Wiring error" @@ -1188,7 +1188,7 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." -"Vous pouvez toujours relancer l'assistant dans Calibration-> Assistant." +"Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." #MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 "XYZ calibration all right. Skew will be corrected automatically." @@ -1196,7 +1196,7 @@ #MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" -"Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot !" +"Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot!" # "X-correct:" @@ -1204,11 +1204,11 @@ #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -"Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations !" +"Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 "XYZ calibration compromised. Front calibration points not reachable." -"Calibration XYZ compromise. Les points de calibration avant ne sont pas atteignables." +"Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 "XYZ calibration compromised. Right front calibration point not reachable." @@ -1216,7 +1216,7 @@ #MSG_LOAD_ALL c=17 "Load all" -"Tout charger" +"Charger un par un" # "XYZ calibration failed. Bed calibration point was not found." @@ -1224,7 +1224,7 @@ # "XYZ calibration failed. Front calibration points not reachable." -"Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." +"Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # "XYZ calibration failed. Right front calibration point not reachable." @@ -1280,15 +1280,15 @@ # "Magnets comp.[N/A]" -"Comp. aimants[N/A]" +"Compens. aim.[N/A]" # "Magnets comp.[Off]" -"Comp. aimants[Off]" +"Compens. aim.[off]" # "Magnets comp. [On]" -"Comp. aimants [On]" +"Compens. aim. [on]" # "Mesh [3x3]" @@ -1308,11 +1308,11 @@ # "MMU Mode [Normal]" -"Mode MMU [Normal]" +"Mode MMU [normal]" # "MMU Mode[Stealth]" -"Mode MMU [Furtif]" +"Mode MMU [feutre]" # "Mode change in progress ..." @@ -1368,7 +1368,7 @@ # "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. " +"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?" @@ -1376,27 +1376,27 @@ # "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." +"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # "PINDA:" "PINDA:" -# +# c=20 r=1 "Preheating to cut" -"Prechauffage pour couper" +"Chauffe pour couper" -# +# c=20 r=1 "Preheating to eject" -"Prechauffage pour ejecter" +"Chauf. pour remonter" # "Printer nozzle diameter differs from the G-code. Continue?" -"Diametre de la buse de l'imprimante different du G-Code. Continuer ?" +"Diametre de la buse dans les reglages ne correspond pas a celui dans le 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." +"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # "Rename" @@ -1412,11 +1412,11 @@ # "Sheet" -"Feuille" +"Plaque" # "Sound [assist]" -"Son [Assist]" +"Son [assist]" # "Steel sheets" @@ -1428,8 +1428,13 @@ # "Z-probe nr. [1]" -"Sonde-Z num. [1]" +"Mesurer x-fois [1]" # "Z-probe nr. [3]" -"Sonde-Z num. [3]" +"Mesurer x-fois [3]" + +# +"Z-probe nr. [5]" +"Mesurer x-fois [5]" + diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0ee9dbec9f..9895e88917 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -979,8 +979,8 @@ "Ordina [tempo]" # -"Severe skew" -"Devia.grave" +"Severe skew:" +"Devia.grave:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Suono [forte]" # -"Slight skew" -"Devia.lieve" +"Slight skew:" +"Devia.lieve:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 602775ff92..36a0f39654 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -979,8 +979,8 @@ "Sortowanie [czas]" # -"Severe skew" -"ZnacznySkos" +"Severe skew:" +"Znaczny skos:" #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" @@ -995,8 +995,8 @@ "Dzwiek [Glosny]" # -"Slight skew" -"Lekki skos" +"Slight skew:" +"Lekki skos:" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" From 015b34de05fd2d5c7d8e7e9e11137c64bb64e337 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 13 Sep 2019 17:09:11 +0200 Subject: [PATCH 126/190] Alert user in wizard about more sheets presets. --- Firmware/ultralcd.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4d9d4c41b4..7bdd15b486 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4782,11 +4782,14 @@ void lcd_wizard(WizState state) break; case S::RepeatLay1Cal: //repeat first layer cal.? wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 - if (wizard_event) { + if (wizard_event) + { lcd_show_fullscreen_message_and_wait_P(_i("Please clean heatbed and then press the knob."));////MSG_WIZARD_CLEAN_HEATBED c=20 r=8 state = S::Lay1Cal; } - else { + else + { + lcd_show_fullscreen_message_and_wait_P(_i("If you have more steel sheets you can calibrate additional presets in Settings / HW Setup / Steel sheets.")); state = S::Finish; } break; From 2541ceccc988af05779f44abcb4795215d6ab423 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 16 Sep 2019 16:20:19 +0200 Subject: [PATCH 127/190] PL translation tuning --- lang/lang_en_pl.txt | 69 +++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 36a0f39654..e3d434d7cd 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -52,7 +52,7 @@ # "SpoolJoin [N/A]" -"SpoolJoin [nd]" +"SpoolJoin [N/D]" #MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" @@ -64,7 +64,7 @@ #MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" -"AutoLadowanie fil." +"Autoladowanie fil." #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." @@ -96,7 +96,7 @@ #MSG_BED_CORRECTION_MENU "Bed level correct" -"Korekta poziomowania stolu" +"Korekta stolu" #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." @@ -176,7 +176,7 @@ #MSG_CRASHDETECT_NA "Crash det. [N/A]" -"Wykr.zderzen[n/d]" +"Wykr.zderzen[N/D]" #MSG_CRASHDETECT_OFF "Crash det. [off]" @@ -204,7 +204,7 @@ #MSG_DISABLE_STEPPERS "Disable steppers" -"Wylaczenie silnikow" +"Wylacz silniki" #MSG_BABYSTEP_Z_NOT_SET c=20 r=12 "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." @@ -256,11 +256,11 @@ #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" -"Went. ekstr:" +"WentHotend:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" -"Informacje o ekstruderze" +"Ekstruder - info" #MSG_MOVE_E "Extruder" @@ -272,7 +272,7 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"Autolad. fil [wl]" +"Autolad.fil. [wl]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" @@ -320,7 +320,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Filament wychodzi z dyszy a kolor jest czysty?" +"Filament wychodzi z dyszy, kolor jest ok?" #MSG_NOT_LOADED c=19 "Filament not loaded" @@ -516,7 +516,7 @@ # "Lin. correction" -"Korekcja lin." +"Korekcja liniowa" #MSG_BABYSTEP_Z "Live adjust Z" @@ -604,7 +604,7 @@ #MSG_STEALTH_MODE_ON "Mode [Stealth]" -"Tryb [Stealth]" +"Tryb [cichy]" #MSG_AUTO_MODE_ON "Mode [auto power]" @@ -688,7 +688,7 @@ # "Nozzle FAN" -"Went. Hotend" +"WentHotend" #MSG_PAUSE_PRINT "Pause print" @@ -720,7 +720,7 @@ #MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 "Please clean the nozzle for calibration. Click when done." -"Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." +"Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." #MSG_SELFTEST_PLEASECHECK "Please check :" @@ -820,7 +820,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -"Went.wydr:" +"WentWydruk:" #MSG_CARD_MENU "Print from SD" @@ -840,11 +840,11 @@ #MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." -"Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +"Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # "Print FAN" -"Went.wydr" +"WentWydruk" #MSG_PRUSA3D "prusa3d.com" @@ -924,7 +924,7 @@ #MSG_SELFTEST_START c=20 "Self test start " -"Rozpoczynanie Selftestu" +"Selftest startuje" #MSG_SELFTEST "Selftest " @@ -932,7 +932,7 @@ #MSG_SELFTEST_ERROR "Selftest error !" -"Blad selftest !" +"Blad selftest!" #MSG_SELFTEST_FAILED c=20 "Selftest failed " @@ -952,7 +952,7 @@ #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" -"Ustaw. temperatury:" +"Ustaw temperature:" #MSG_SETTINGS "Settings" @@ -984,7 +984,7 @@ #MSG_SORT_ALPHA c=17 r=1 "Sort [alphabet]" -"Sortowan[alfabet]" +"Sortowanie[alfab]" #MSG_SORTING c=20 r=1 "Sorting files" @@ -992,7 +992,7 @@ #MSG_SOUND_LOUD c=17 r=1 "Sound [loud]" -"Dzwiek [Glosny]" +"Dzwiek [glosny]" # "Slight skew:" @@ -1000,11 +1000,11 @@ #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" -"Dzwiek[Wylaczony]" +"Dzwiek[wylaczony]" # "Some problem encountered, Z-leveling enforced ..." -"Wykryto problem, wymuszono poziomowanie osi Z ..." +"Wykryto problem, wymuszono poziomowanie osi Z." #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" @@ -1012,7 +1012,7 @@ #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -"Dzwiek [Cichy]" +"Dzwiek [cichy]" #MSG_SPEED "Speed" @@ -1084,11 +1084,11 @@ # "Total filament" -"Calkowita dlugosc filamentu" +"Zuzycie filamentu" # "Total print time" -"Calkowity czas druku" +"Laczny czas druku" #MSG_TUNE "Tune" @@ -1280,7 +1280,7 @@ # "Magnets comp.[N/A]" -"Kor. magnesow [nd]" +"Kor. magnesow[N/D]" # "Magnets comp.[Off]" @@ -1300,7 +1300,7 @@ # "Mesh bed leveling" -"Poziomowanie wg siatki" +"Poziomowanie stolu" # "MK3S firmware detected on MK3 printer" @@ -1413,10 +1413,9 @@ # "Sheet" "Plyta" - # -"Sound [assist]" -"Dzwiek [asyst.]" +"Sound [assist]" +"Dzwiek [asyst.]" # "Steel sheets" @@ -1428,8 +1427,12 @@ # "Z-probe nr. [1]" -"Pomiar-Z [1]" +"Ilosc Pomiarow [1]" # "Z-probe nr. [3]" -"Pomiar-Z [3]" +"Ilosc Pomiarow [3]" + +# +"Z-probe nr. [5]" +"Ilosc Pomiarow [5]" From b99038736c9eeeffb994e21619c9bf0e9b552011 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 16 Sep 2019 18:22:34 +0200 Subject: [PATCH 128/190] Use eeprom_update_byte instead of eeprom_write_byte --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7bdd15b486..537541cf88 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4688,10 +4688,10 @@ void lcd_wizard(WizState state) 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) { state = S::Restore; - eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); + eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); } else { - eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); + eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); end = true; } break; @@ -4701,7 +4701,7 @@ void lcd_wizard(WizState state) case CALIBRATION_STATUS_XYZ_CALIBRATION: state = S::Xyz; break; //run xyz cal. case CALIBRATION_STATUS_Z_CALIBRATION: state = S::Z; break; //run z cal. case CALIBRATION_STATUS_LIVE_ADJUST: state = S::IsFil; break; //run live adjust - case CALIBRATION_STATUS_CALIBRATED: end = true; eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); break; + case CALIBRATION_STATUS_CALIBRATED: end = true; eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); break; default: state = S::Selftest; break; //if calibration status is unknown, run wizard from the beginning } break; @@ -4794,7 +4794,7 @@ void lcd_wizard(WizState state) } break; case S::Finish: //we are finished - eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); + eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); end = true; break; From 002a7d31a4abbdf292fa8c87fcfa993c91936904 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 16 Sep 2019 18:31:12 +0200 Subject: [PATCH 129/190] Make lcd_wizard() more debug friendly. --- Firmware/ultralcd.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 537541cf88..38d7bf48ed 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4669,6 +4669,10 @@ void lcd_wizard(WizState state) bool end = false; int wizard_event; const char *msg = NULL; + // Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point + // other than WizState::Run - it is useful for debugging wizard. + if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); + while (!end) { printf_P(PSTR("Wizard state: %d\n"), state); switch (state) { From ff4450489be7f370b72506c417ae5adb57280db3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 16 Sep 2019 18:38:44 +0200 Subject: [PATCH 130/190] Document. --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 38d7bf48ed..eecab8b8ad 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4663,6 +4663,7 @@ bool lcd_autoDepleteEnabled() //! ---------------------- | ---------------- //! WizState::Run | Main entry point //! WizState::RepeatLay1Cal | Entry point after passing 1st layer calibration +//! WizState::LoadFil | Entry point after temporarily left for preheat before load filament void lcd_wizard(WizState state) { using S = WizState; From e1cfd6dc4f58aac59896832c07c9bbf8f08fe209 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 16 Sep 2019 18:48:52 +0200 Subject: [PATCH 131/190] Remove option to heat nozzle only from mFilamentItem() when activated from wizard, as it has no use after filament unload was removed from wizard. --- Firmware/ultralcd.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index eecab8b8ad..57c63096de 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2139,12 +2139,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) nTargetOld = target_temperature[0]; nTargetBedOld = target_temperature_bed; setTargetHotend0((float )nTemp); - - if (!eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) || - eFilamentAction == FilamentAction::Lay1Cal) - { - setTargetBed((float) nTempBed); - } + setTargetBed((float) nTempBed); { const FilamentAction action = eFilamentAction; From c66b4bd8760bbf44df04db9b28faf5bd4634790c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 16 Sep 2019 21:14:17 +0200 Subject: [PATCH 132/190] Do not ask for preheat temperature twice if calibrating first layer from wizard without filament. --- Firmware/ultralcd.cpp | 51 +++++++++++++++++++++++++++++++------------ Firmware/ultralcd.h | 6 +++-- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 57c63096de..6768258bb3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2152,7 +2152,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) } else if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { - lcd_wizard(WizState::LoadFil); + lcd_wizard(WizState::LoadFilHot); } return; } @@ -4637,6 +4637,24 @@ bool lcd_autoDepleteEnabled() return (lcd_autoDeplete && fsensor_enabled); } +static void wizard_lay1cal_message(bool cold) +{ + lcd_show_fullscreen_message_and_wait_P( + _i("Now I will calibrate distance between tip of the nozzle and heatbed surface.")); ////MSG_WIZARD_V2_CAL c=20 r=8 + if (mmu_enabled) + { + lcd_show_fullscreen_message_and_wait_P( + _i("First you will select filament you wish to use for calibration. Then select temperature which matches your material.")); + } + else if (cold) + { + lcd_show_fullscreen_message_and_wait_P( + _i("Select temperature which matches your material.")); + } + lcd_show_fullscreen_message_and_wait_P( + _i("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.")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12 +} + //! @brief Printer first run wizard (Selftest and calibration) //! //! @@ -4753,10 +4771,10 @@ void lcd_wizard(WizState state) { wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 } - if (wizard_event) state = S::Lay1Cal; + if (wizard_event) state = S::Lay1CalCold; else { - if(mmu_enabled) state = S::LoadFil; + if(mmu_enabled) state = S::LoadFilCold; else state = S::Preheat; } break; @@ -4765,27 +4783,31 @@ void lcd_wizard(WizState state) lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material.")); end = true; // Leave wizard temporarily for lcd_preheat_menu break; - case S::LoadFil: //load filament + case S::LoadFilHot: //load filament wait_preheat(); lcd_wizard_load(); - state = S::Lay1Cal; + state = S::Lay1CalHot; break; - case S::Lay1Cal: - lcd_show_fullscreen_message_and_wait_P(_i("Now I will calibrate distance between tip of the nozzle and heatbed surface."));////MSG_WIZARD_V2_CAL c=20 r=8 - if(mmu_enabled) - { - lcd_show_fullscreen_message_and_wait_P(_i("First you will select filament you wish to use for calibration.")); - } - lcd_show_fullscreen_message_and_wait_P(_i("Select temperature which matches your material. Then 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."));////MSG_WIZARD_V2_CAL_2 c=20 r=12 + case S::LoadFilCold: //load filament + lcd_wizard_load(); + state = S::Lay1CalCold; + break; + case S::Lay1CalCold: + wizard_lay1cal_message(true); menu_goto(lcd_v2_calibration,0,false,true); end = true; // Leave wizard temporarily for lcd_v2_calibration break; + case S::Lay1CalHot: + wizard_lay1cal_message(false); + lcd_commands_type = LcdCommands::Layer1Cal; + end = true; // Leave wizard temporarily for lcd_v2_calibration + break; case S::RepeatLay1Cal: //repeat first layer cal.? wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 if (wizard_event) { lcd_show_fullscreen_message_and_wait_P(_i("Please clean heatbed and then press the knob."));////MSG_WIZARD_CLEAN_HEATBED c=20 r=8 - state = S::Lay1Cal; + state = S::Lay1CalCold; } else { @@ -4825,7 +4847,8 @@ void lcd_wizard(WizState state) break; } - if (!((S::Lay1Cal == state) || (S::Preheat == state))) { + if (!((S::Lay1CalCold == state) || (S::Lay1CalHot == state) || (S::Preheat == state))) + { lcd_show_fullscreen_message_and_wait_P(msg); } lcd_update_enable(true); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 15e0d3da4c..03b0483125 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -231,9 +231,11 @@ enum class WizState : uint8_t IsFil, //!< Is filament loaded? Entry point for 1st layer calibration PreheatPla, //!< waiting for preheat nozzle for PLA Preheat, //!< Preheat for any material - LoadFil, //!< Load filament + LoadFilCold, //!< Load filament for MMU + LoadFilHot, //!< Load filament without MMU IsPla, //!< Is PLA filament? - Lay1Cal, //!< First layer calibration + Lay1CalCold, //!< First layer calibration, temperature not selected yet + Lay1CalHot, //!< First layer calibration, temperature already selected RepeatLay1Cal, //!< Repeat first layer calibration? Finish, //!< Deactivate wizard }; From b4e0c2f455ff3ec43a4e7e29ae038cbd1592c59b Mon Sep 17 00:00:00 2001 From: michalrudolf <55433770+michalrudolf@users.noreply.github.com> Date: Tue, 17 Sep 2019 10:51:43 +0200 Subject: [PATCH 133/190] Update ultralcd.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Menu Support -> XYZ calibration details -> 3. obrazovka "point offset" X value is no longer moved to the left if there’s no negative sign --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 608b8c2911..a78063ada1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3023,9 +3023,9 @@ static void lcd_menu_xyz_offset() for (uint_least8_t i = 0; i < 2; i++) { - lcd_puts_at_P(11, i + 2, PSTR("")); + lcd_puts_at_P((cntr[i] < 0) ? 10 : 11, i + 2, PSTR("")); lcd_print(cntr[i]); - lcd_puts_at_P((cntr[i] < 0) ? 17 : 16, i + 2, PSTR("mm")); + lcd_puts_at_P(16, i + 2, PSTR("mm")); } menu_back_if_clicked(); } From b660cb39087a1e465d56589fc899817a65b6cc26 Mon Sep 17 00:00:00 2001 From: michalrudolf <55433770+michalrudolf@users.noreply.github.com> Date: Tue, 17 Sep 2019 11:46:29 +0200 Subject: [PATCH 134/190] ultralcd.cpp --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a78063ada1..151b4918e5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3023,7 +3023,7 @@ static void lcd_menu_xyz_offset() for (uint_least8_t i = 0; i < 2; i++) { - lcd_puts_at_P((cntr[i] < 0) ? 10 : 11, i + 2, PSTR("")); + lcd_set_cursor((cntr[i] < 0) ? 10 : 11, i+2); lcd_print(cntr[i]); lcd_puts_at_P(16, i + 2, PSTR("mm")); } From 96012784fd754a9423d48af4bc5c50c01e5adea4 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 17 Sep 2019 16:30:40 +0200 Subject: [PATCH 135/190] Fine tuning German translation --- lang/lang_en_de.txt | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 00d48eca65..b2f63cf0d9 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -64,7 +64,7 @@ #MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" -"Auto-Laden Filament" +"AutoLaden Filament" #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." @@ -320,7 +320,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Filament extrudiert + richtige Farbe?" +"Filament extrudiert mit richtiger Farbe?" #MSG_NOT_LOADED c=19 "Filament not loaded" @@ -556,11 +556,11 @@ #MSG_MESH_BED_LEVELING "Mesh Bed Leveling" -"Mesh Bett Ausgleich" +"MeshBett Ausgleich" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." -"MMU OK. Position wiederherstellen... " +"MMU OK. Position wiederherstellen..." #MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 "MMU OK. Resuming temperature..." @@ -828,7 +828,7 @@ # "Press the knob" -"Knopf druecken" +"Knopf druecken zum" #MSG_PRINT_PAUSED c=20 r=1 "Print paused" @@ -844,7 +844,7 @@ # "Print FAN" -"Druckvent" +"Druckvent." #MSG_PRUSA3D "prusa3d.com" @@ -868,7 +868,7 @@ #MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -"XYZ Kalibr. zuruecksetzen." +"Reset XYZ Kalibr." #MSG_BED_CORRECTION_RESET "Reset" @@ -936,7 +936,7 @@ #MSG_SELFTEST_FAILED c=20 "Selftest failed " -"Selbsttest misslang " +"Selbsttest Error " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." @@ -1104,11 +1104,11 @@ # "to load filament" -"zum Filament laden" +"Filament laden" # "to unload filament" -"zum Filament entladen" +"Filament entladen" #MSG_UNLOAD_FILAMENT c=17 "Unload filament" @@ -1249,7 +1249,7 @@ # "Checks" -"\x00" +"Kontrolle" # "False triggering" @@ -1265,11 +1265,11 @@ # "Firmware [strict]" -"Firmware [streng]" +"Firmware [strikt]" # "Firmware [warn]" -"\x00" +"Firmware [warnen]" # "HW Setup" @@ -1293,15 +1293,15 @@ # "Mesh [3x3]" -"\x00" +"Gitter [3x3]" # "Mesh [7x7]" -"\x00" +"Gitter [7x7]" # "Mesh bed leveling" -"Mesh Bett Ausgleich" +"MeshBett Ausgleich" # "MK3S firmware detected on MK3 printer" @@ -1325,11 +1325,11 @@ # "Model [strict]" -"Modell [streng]" +"Modell [strikt]" # "Model [warn]" -"Modell [warn]" +"Modell [warnen]" # "Nozzle d. [0.25]" @@ -1349,11 +1349,11 @@ # "Nozzle [strict]" -"Duese [streng]" +"Duese [strikt]" # "Nozzle [warn]" -"Duese [warn]" +"Duese [warnen]" # "G-code sliced for a different level. Continue?" @@ -1434,3 +1434,7 @@ # "Z-probe nr. [3]" "Z-Probe Nr. [3]" + +# +"Z-probe nr. [5]" +"Z-Probe Nr. [5]" From 14933f6b0e26894789af1284ad1b529f65a9e508 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 17 Sep 2019 16:50:51 +0200 Subject: [PATCH 136/190] Fix. Sound [assist], Z-probe [5], menu_fmt_float13off format for last string parameter from PROGMEM --- Firmware/menu.cpp | 2 +- lang/lang_en_cz.txt | 8 ++++++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 8 ++++++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 8 ++++++-- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index bb721dba98..352191024b 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -399,7 +399,7 @@ const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; const char menu_fmt_float13[] PROGMEM = "%c%-13.13S%+5.3f"; -const char menu_fmt_float13off[] PROGMEM = "%c%-13.13S%6.6s"; +const char menu_fmt_float13off[] PROGMEM = "%c%-13.13S%6.6S"; template static void menu_draw_P(char chr, const char* str, int16_t val); diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 8d8bed552a..2b5c5540ce 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1415,8 +1415,8 @@ "Plat" # -"Sound [assist]" -"Zvuk [Asist.]" +"Sound [assist]" +"Zvuk [Asist.]" # "Steel sheets" @@ -1433,3 +1433,7 @@ # "Z-probe nr. [3]" "Pocet mereni Z [3]" + +# +"Z-probe nr. [5]" +"Pocet mereni Z [5]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index b2f63cf0d9..266d3c26d8 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1416,8 +1416,8 @@ "Blech" # -"Sound [assist]" -"Sound [Assist]" +"Sound [assist]" +"Sound [Assist]" # "Steel sheets" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bcf3794aba..d2a99c721e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1415,8 +1415,8 @@ "Lamina" # -"Sound [assist]" -"Sonido [asistido]" +"Sound [assist]" +"Sonido [asistido]" # "Steel sheets" @@ -1433,3 +1433,7 @@ # "Z-probe nr. [3]" "Z-sensor nr. [3]" + +# +"Z-probe nr. [5]" +"Z-sensor nr. [5]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 3f53ff9ab4..5a33f9b540 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1415,8 +1415,8 @@ "Plaque" # -"Sound [assist]" -"Son [assist]" +"Sound [assist]" +"Son [assist]" # "Steel sheets" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 9895e88917..2a7277d4ed 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1415,8 +1415,8 @@ "Piano" # -"Sound [assist]" -"Suono [assistito]" +"Sound [assist]" +"Suono [assistito]" # "Steel sheets" @@ -1433,3 +1433,7 @@ # "Z-probe nr. [3]" "Z-probe nr. [3]" + +# +"Z-probe nr. [5]" +"Z-probe nr. [5]" From 966d9baf2b58a00edc99bbd1e1554fb0e9a738a6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 17 Sep 2019 18:58:59 +0200 Subject: [PATCH 137/190] Document. --- Firmware/ultralcd.cpp | 42 ++++++++++++++++++++++++++++-------------- Firmware/ultralcd.h | 6 +++--- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6768258bb3..3e76fbec95 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4663,11 +4663,25 @@ static void wizard_lay1cal_message(bool cold) //! @startuml //! [*] --> IsFil //! IsFil : Is any filament loaded? -//! load : Push the button to start loading Filament 1 +//! LoadFilCold : Push the button to start loading Filament 1 //! -//! IsFil --> calibration : yes -//! IsFil --> load : no -//! load --> calibration : click +//! IsFil --> Lay1CalCold : yes +//! IsFil --> LoadFilCold : no +//! LoadFilCold --> Lay1CalCold : click +//! @enduml +//! +//! First layer calibration without MMU state diagram +//! +//! @startuml +//! [*] --> IsFil +//! IsFil : Is filament loaded? +//! Preheat : Select nozle temperature which matches your material. +//! LoadFilHot : Insert filament to extruder and press the knob. +//! +//! IsFil --> Lay1CalCold : yes +//! IsFil --> Preheat : no +//! Preheat --> LoadFilHot : select +//! LoadFilHot --> Lay1CalHot : click //! @enduml //! //! @param state Entry point of the wizard @@ -4676,7 +4690,7 @@ static void wizard_lay1cal_message(bool cold) //! ---------------------- | ---------------- //! WizState::Run | Main entry point //! WizState::RepeatLay1Cal | Entry point after passing 1st layer calibration -//! WizState::LoadFil | Entry point after temporarily left for preheat before load filament +//! WizState::LoadFilHot | Entry point after temporarily left for preheat before load filament void lcd_wizard(WizState state) { using S = WizState; @@ -4713,7 +4727,7 @@ void lcd_wizard(WizState state) end = true; } break; - case S::Restore: // restore calibration status + case S::Restore: switch (calibration_status()) { case CALIBRATION_STATUS_ASSEMBLED: state = S::Selftest; break; //run selftest case CALIBRATION_STATUS_XYZ_CALIBRATION: state = S::Xyz; break; //run xyz cal. @@ -4732,13 +4746,13 @@ void lcd_wizard(WizState state) } else end = true; break; - case S::Xyz: //xyz calibration + case S::Xyz: lcd_show_fullscreen_message_and_wait_P(_i("I will run xyz calibration now. It will take approx. 12 mins."));////MSG_WIZARD_XYZ_CAL c=20 r=8 wizard_event = gcode_M45(false, 0); if (wizard_event) state = S::IsFil; else end = true; break; - case S::Z: //z calibration + case S::Z: lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first.")); lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet.")); lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8 @@ -4760,8 +4774,8 @@ void lcd_wizard(WizState state) } else end = true; break; - case S::IsFil: //is filament loaded? - //start to preheat nozzle and bed to save some time later + case S::IsFil: + //start to preheat nozzle and bed to save some time later setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0); setTargetBed(PLA_PREHEAT_HPB_TEMP); if (mmu_enabled) @@ -4783,12 +4797,12 @@ void lcd_wizard(WizState state) lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material.")); end = true; // Leave wizard temporarily for lcd_preheat_menu break; - case S::LoadFilHot: //load filament + case S::LoadFilHot: wait_preheat(); lcd_wizard_load(); state = S::Lay1CalHot; break; - case S::LoadFilCold: //load filament + case S::LoadFilCold: lcd_wizard_load(); state = S::Lay1CalCold; break; @@ -4802,7 +4816,7 @@ void lcd_wizard(WizState state) lcd_commands_type = LcdCommands::Layer1Cal; end = true; // Leave wizard temporarily for lcd_v2_calibration break; - case S::RepeatLay1Cal: //repeat first layer cal.? + case S::RepeatLay1Cal: wizard_event = lcd_show_multiscreen_message_yes_no_and_wait_P(_i("Do you want to repeat last step to readjust distance between nozzle and heatbed?"), false);////MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 if (wizard_event) { @@ -4815,7 +4829,7 @@ void lcd_wizard(WizState state) state = S::Finish; } break; - case S::Finish: //we are finished + case S::Finish: eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); end = true; break; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 03b0483125..aef8067b20 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -223,12 +223,12 @@ bool lcd_autoDepleteEnabled(); //! @brief Wizard state enum class WizState : uint8_t { - Run, //!< run wizard? Entry point. + Run, //!< run wizard? Main entry point. Restore, //!< restore calibration status - Selftest, + Selftest, //!< self test Xyz, //!< xyz calibration Z, //!< z calibration - IsFil, //!< Is filament loaded? Entry point for 1st layer calibration + IsFil, //!< Is filament loaded? First step of 1st layer calibration PreheatPla, //!< waiting for preheat nozzle for PLA Preheat, //!< Preheat for any material LoadFilCold, //!< Load filament for MMU From 027b6238fd8406ea6d65a02d03cda166fcbb4feb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 17 Sep 2019 20:26:03 +0200 Subject: [PATCH 138/190] Mark code unused when PINDA_THERMISTOR is defined by macro. Saves 1B of RAM and 4B of FLASH memory. --- Firmware/Marlin.h | 2 -- Firmware/Marlin_main.cpp | 31 ++++++++++++++++--------------- Firmware/temperature.cpp | 2 ++ Firmware/ultralcd.cpp | 10 +++++++--- Firmware/ultralcd.h | 2 ++ 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 6098731faf..7b44fef879 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -423,8 +423,6 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y); #endif //HEATBED_ANALYSIS float temp_comp_interpolation(float temperature); -void temp_compensation_apply(); -void temp_compensation_start(); void show_fw_version_warnings(); uint8_t check_printer_version(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ad81a061e9..f80143fda2 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -397,6 +397,9 @@ static bool setTargetedHotend(int code, uint8_t &extruder); static void print_time_remaining_init(); static void wait_for_heater(long codenum, uint8_t extruder); static void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis); +static void temp_compensation_start(); +static void temp_compensation_apply(); + uint16_t gcode_in_progress = 0; uint16_t mcode_in_progress = 0; @@ -4617,7 +4620,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) case_G80: { mesh_bed_leveling_flag = true; +#ifndef PINDA_THERMISTOR static bool run = false; +#endif // ndef PINDA_THERMISTOR #ifdef SUPPORT_VERBOSITY int8_t verbosity_level = 0; @@ -4665,13 +4670,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) } bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); - bool temp_comp_start = true; -#ifdef PINDA_THERMISTOR - temp_comp_start = false; -#endif //PINDA_THERMISTOR - - if (temp_comp_start) - if (run == false && temp_cal_active == true && calibration_status_pinda() == true && target_temperature_bed >= 50) { +#ifndef PINDA_THERMISTOR + if (run == false && temp_cal_active == true && calibration_status_pinda() == true && target_temperature_bed >= 50) + { if (lcd_commands_type != LcdCommands::StopPrint) { temp_compensation_start(); run = true; @@ -4683,7 +4684,8 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) } break; } - run = false; + run = false; +#endif //PINDA_THERMISTOR if (lcd_commands_type == LcdCommands::StopPrint) { mesh_bed_leveling_flag = false; break; @@ -4900,12 +4902,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) clean_up_after_endstop_move(l_feedmultiply); // SERIAL_ECHOLNPGM("clean up finished "); - bool apply_temp_comp = true; -#ifdef PINDA_THERMISTOR - apply_temp_comp = false; -#endif - if (apply_temp_comp) +#ifndef PINDA_THERMISTOR if(temp_cal_active == true && calibration_status_pinda() == true) temp_compensation_apply(); //apply PINDA temperature compensation +#endif babystep_apply(); // Apply Z height correction aka baby stepping before mesh bed leveing gets activated. // SERIAL_ECHOLNPGM("babystep applied"); bool eeprom_bed_correction_valid = eeprom_read_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID) == 1; @@ -9354,7 +9353,8 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ } #endif //HEATBED_ANALYSIS -void temp_compensation_start() { +#ifndef PINDA_THERMISTOR +static void temp_compensation_start() { custom_message_type = CustomMsg::TempCompPreheat; custom_message_state = PINDA_HEAT_T + 1; @@ -9381,7 +9381,7 @@ void temp_compensation_start() { custom_message_state = 0; } -void temp_compensation_apply() { +static void temp_compensation_apply() { int i_add; int z_shift = 0; float z_shift_mm; @@ -9404,6 +9404,7 @@ void temp_compensation_apply() { //we have no temp compensation data } } +#endif //ndef PINDA_THERMISTOR float temp_comp_interpolation(float inp_temperature) { diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 3c7f5fbc48..39fd95fca9 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1565,7 +1565,9 @@ extern "C" { void adc_ready(void) //callback from adc when sampling finished { current_temperature_raw[0] = adc_values[ADC_PIN_IDX(TEMP_0_PIN)]; //heater +#ifdef PINDA_THERMISTOR current_temperature_raw_pinda_fast = adc_values[ADC_PIN_IDX(TEMP_PINDA_PIN)]; +#endif //PINDA_THERMISTOR current_temperature_bed_raw = adc_values[ADC_PIN_IDX(TEMP_BED_PIN)]; #ifdef VOLT_PWR_PIN current_voltage_raw_pwr = adc_values[ADC_PIN_IDX(VOLT_PWR_PIN)]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3e76fbec95..ed662887bd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1863,11 +1863,11 @@ static void lcd_menu_temperatures() lcd_timeoutToStatus.stop(); //infinite timeout lcd_home(); lcd_printf_P(PSTR(" %S: %d%c \n" " %S: %d%c \n"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); -#ifdef AMBIENT_THERMISTOR +#if defined (AMBIENT_THERMISTOR) && defined (PINDA_THERMISTOR) lcd_printf_P(PSTR(" %S: %d%c\n" " PINDA: %d%c"), _i("Ambient"), (int)current_temperature_ambient, '\x01', (int)current_temperature_pinda, '\x01'); -#else //AMBIENT_THERMISTOR +#elif defined (PINDA_THERMISTOR) lcd_printf_P(PSTR(" PINDA: %d%c"), (int)current_temperature_pinda, '\x01'); -#endif //AMBIENT_THERMISTOR +#endif menu_back_if_clicked(); } @@ -2969,9 +2969,11 @@ static void lcd_babystep_z() eeprom_update_byte(&(EEPROM_Sheets_base->s[(eeprom_read_byte( &(EEPROM_Sheets_base->active_sheet)))].bed_temp), target_temperature_bed); +#ifdef PINDA_THERMISTOR eeprom_update_byte(&(EEPROM_Sheets_base->s[(eeprom_read_byte( &(EEPROM_Sheets_base->active_sheet)))].pinda_temp), current_temperature_pinda); +#endif //PINDA_THERMISTOR calibration_status_store(CALIBRATION_STATUS_CALIBRATED); } if (LCD_CLICKED) menu_back(); @@ -3140,6 +3142,7 @@ void lcd_adjust_z() { }*/ +#ifdef PINDA_THERMISTOR bool lcd_wait_for_pinda(float temp) { lcd_set_custom_characters_degree(); setAllTargetHotends(0); @@ -3168,6 +3171,7 @@ bool lcd_wait_for_pinda(float temp) { lcd_update_enable(true); return target_temp_reached; } +#endif //PINDA_THERMISTOR void lcd_wait_for_heater() { lcd_display_message_fullscreen_P(_T(MSG_WIZARD_HEATING)); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index aef8067b20..4ce9679583 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -197,7 +197,9 @@ void lcd_wait_for_cool_down(); void lcd_extr_cal_reset(); void lcd_temp_cal_show_result(bool result); +#ifdef PINDA_THERMISTOR bool lcd_wait_for_pinda(float temp); +#endif //PINDA_THERMISTOR void bowden_menu(); From 19a85379013a63eb46fcfb00d11efe73930d57b4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 17 Sep 2019 20:35:18 +0200 Subject: [PATCH 139/190] Document. --- 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 f80143fda2..ec5e8c0ca3 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4621,7 +4621,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) { mesh_bed_leveling_flag = true; #ifndef PINDA_THERMISTOR - static bool run = false; + static bool run = false; // thermistor-less PINDA temperature compensation is running #endif // ndef PINDA_THERMISTOR #ifdef SUPPORT_VERBOSITY From e7273ea50522d3fb52c0bfeac3d608305e41b023 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 18 Sep 2019 12:49:44 +0200 Subject: [PATCH 140/190] Fix [French translation] Wrong display during mesh bed calibration #2218 minor code/doc improvements --- Firmware/ultralcd.cpp | 21 ++++++++++++++------- lang/lang_en_fr.txt | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 26d78b645b..ec36acef01 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1674,9 +1674,12 @@ static void lcd_cooldown() //! It would have been much easier if there was a ':' in the labels. //! But since the texts like Bed, Nozzle and PINDA are used in other places //! it is better to reuse these texts even though it requires some extra formatting code. +//! @param [in] ipgmLabel pointer to string in PROGMEM +//! @param [out] pointer to string in RAM which will receive the formatted text. Must be allocated to appropriate size +//! @param [in] dstSize allocated length of dst static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize){ uint8_t i = 0; - for(; i < dstSize - 2; ++i){ // 1 byte less than buffer, we'd be adding a ':' to the end + for(; i < dstSize - 2; ++i){ // 2 byte less than buffer, we'd be adding a ':' to the end uint8_t b = pgm_read_byte(ipgmLabel + i); if( ! b ) break; @@ -1686,7 +1689,7 @@ static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize ++i; for(; i < dstSize - 1; ++i) // fill the rest with spaces dst[i] = ' '; - dst[dstSize-1] = 0; // terminate the string properly + dst[dstSize-1] = '\0'; // terminate the string properly } void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") @@ -1701,9 +1704,10 @@ void lcd_menu_extruder_info() // NOT static due to using ins // Display Nozzle fan RPM lcd_timeoutToStatus.stop(); //infinite timeout lcd_home(); - char nozzle[12], print[12]; - pgmtext_with_colon(_i("Nozzle FAN"), nozzle, 12); - pgmtext_with_colon(_i("Print FAN"), print, 12); + static const size_t maxChars = 12; + char nozzle[maxChars], print[maxChars]; + pgmtext_with_colon(_i("Nozzle FAN"), nozzle, maxChars); + pgmtext_with_colon(_i("Print FAN"), print, maxChars); lcd_printf_P(_N("%s %4d RPM\n" "%s %4d RPM\n"), nozzle, 60*fan_speed[0], print, 60*fan_speed[1] ); #ifdef PAT9125 @@ -1888,9 +1892,12 @@ static void lcd_menu_debug() #endif /* DEBUG_BUILD */ //! @brief common line print for lcd_menu_temperatures +//! @param [in] ipgmLabel pointer to string in PROGMEM +//! @param [in] value to be printed behind the label static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){ - char tmp[15]; - pgmtext_with_colon(ipgmLabel, tmp, 15); + static const size_t maxChars = 15; + char tmp[maxChars]; + pgmtext_with_colon(ipgmLabel, tmp, maxChars); lcd_printf_P(PSTR(" %s%3d\x01 \n"), tmp, value); // no need to add -14.14 to string alignment } static void lcd_menu_temperatures() diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 5a33f9b540..d3256935a1 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -136,7 +136,7 @@ #MSG_CALIBRATE_Z_AUTO c=20 r=2 "Calibrating Z" -"Calibration de Z" +"Calibration Z" #MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." From a595294037eda8682b23b3a76e5060e837f86e1d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 18 Sep 2019 13:05:38 +0200 Subject: [PATCH 141/190] Documentation update for git-bash ... ... as Linux does not handle spaces in folder names well. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dc8379f85b..8b04c0c97c 100644 --- a/README.md +++ b/README.md @@ -123,10 +123,10 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. - Download and install the 64bit Git version https://git-scm.com/download/win - Also follow these instructions https://gist.github.com/evanwill/0207876c3243bbb6863e65ec5dc3f058 - Download and install 7z-zip from its official website https://www.7-zip.org/ - By default, it is installed under the directory /c/Program Files/7-Zip in Windows 10 + By default, it is installed under the directory /c/Program\ Files/7-Zip in Windows 10 - Run `Git-Bash` under Administrator privilege -- navigate to the directory /c/Program Files/Git/mingw64/bin -- run `ln -s /c/Program Files/7-Zip/7z.exe zip.exe` +- navigate to the directory /c/Program\ Files/Git/mingw64/bin +- run `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe` #### Compile Prusa-firmware with Git-bash installed - open Git-bash From 2944c3fd59a1c39ecc18b32b39a603d3ee2c4c7b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 18 Sep 2019 13:22:47 +0200 Subject: [PATCH 142/190] Add path examples for Non-english Windows As Windows in few languages has different Names for `Users` and `Program Files` added few examples in the documentation. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8b04c0c97c..782ed6f7da 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,9 @@ Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and - Unix and windows have different line endings (LF vs CRLF), try dos2unix to convert - This should fix the `"$'\r': command not found"` error - to install run `apt-get install dos2unix` - +- If your Windows isn't in English the Paths may look different + Example in other languages + - English `/mnt/c/Users//Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender//Downloads/Prusa-Firmware-MK3` #### Compile Prusa-firmware with Ubuntu Linux subsystem installed - open Ubuntu bash - change to your source code folder (case sensitive) @@ -127,7 +129,10 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. - Run `Git-Bash` under Administrator privilege - navigate to the directory /c/Program\ Files/Git/mingw64/bin - run `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe` - +- If your Windows isn't in English the Paths may look different + Example in other languages + - English `/mnt/c/Users//Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender//Downloads/Prusa-Firmware-MK3` + - English `ln -s /c/Program\ Files/7-Zip/7z.exe zip.exe` will be on a Spanish Windows `ln -s /c/Archivos\ de\ programa/7-Zip/7z.exe zip.exe` #### Compile Prusa-firmware with Git-bash installed - open Git-bash - change to your source code folder From bcf8774fd5f0f7d7ec6908122b327dee8cdb6fa6 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 18 Sep 2019 14:55:23 +0200 Subject: [PATCH 143/190] EN, IT, ES fixes Sound [assist] should work now ES, IT preliminary updates --- lang/lang_en.txt | 2 +- lang/lang_en_es.txt | 10 +++++----- lang/lang_en_it.txt | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a39ae94b4f..7661c3b803 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1061,7 +1061,7 @@ "Sheet" # -"Sound [assist]" +"Sound [assist]" # "Steel sheets" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index d2a99c721e..feba1a0d15 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -24,7 +24,7 @@ #MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" -"Ajustando Z:" +"Ajustar-Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " @@ -216,7 +216,7 @@ #MSG_EXTRUDER_CORRECTION c=10 "E-correct:" -"Correccion-E:" +"Corregir-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1200,7 +1200,7 @@ # "X-correct:" -"Correccion-X:" +"Corregir-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1236,7 +1236,7 @@ # "Y-correct:" -"Correccion-Y:" +"Corregir-Y:" #MSG_OFF " [off]" @@ -1424,7 +1424,7 @@ # "Z-correct:" -"Correccion-Z:" +"Corregir-Z:" # "Z-probe nr. [1]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 2a7277d4ed..bbb9fefc72 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -108,7 +108,7 @@ #MSG_MENU_BELT_STATUS c=15 r=1 "Belt status" -"Stato delle cinghie" +"Stato cinghie" #MSG_RECOVER_PRINT c=20 r=2 "Blackout occurred. Recover print?" @@ -272,7 +272,7 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"Autocar.filam[on]" +"Autocar.fil. [on]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" @@ -304,15 +304,15 @@ #MSG_FSENSOR_ON "Fil. sensor [on]" -"Sensor filam.[on]" +"Sensore fil. [on]" #MSG_FSENSOR_NA "Fil. sensor [N/A]" -"Sensor filam[N/A]" +"Sensore fil.[N/A]" #MSG_FSENSOR_OFF "Fil. sensor [off]" -"Sensor filam[off]" +"Sensore fil.[off]" # "Filam. runouts" @@ -348,7 +348,7 @@ #MSG_V2_CALIBRATION c=17 r=1 "First layer cal." -"Calibrazione primo layer." +"Cal. primo strato" #MSG_WIZARD_SELFTEST c=20 r=8 "First, I will run the selftest to check most common assembly problems." @@ -516,7 +516,7 @@ # "Lin. correction" -"Correzione lin." +"Correzione lineare" #MSG_BABYSTEP_Z "Live adjust Z" @@ -976,7 +976,7 @@ #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Ordina [tempo]" +"Ordina [chron.]" # "Severe skew:" From 36f5b082896664d2c11a5c9e739d557b46ec1c35 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 19 Sep 2019 08:42:49 +0200 Subject: [PATCH 144/190] update ES, IT --- lang/lang_en_es.txt | 2 +- lang/lang_en_it.txt | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index feba1a0d15..d8d68fe2e3 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -976,7 +976,7 @@ #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Ordenar [tiempo]" +"Ordenar [fecha]" # "Severe skew:" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bbb9fefc72..6537f78ed9 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -"Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." +"Caricamento automatico attivo, premi la manopola e inserisci il filamento." #MSG_SELFTEST_AXIS_LENGTH "Axis length" @@ -172,15 +172,15 @@ #MSG_CRASHDETECT_ON "Crash det. [on]" -"Rilevam.imp. [on]" +"Rileva.crash [on]" #MSG_CRASHDETECT_NA "Crash det. [N/A]" -"Rilevam.imp.[N/A]" +"Rileva.crash[N/A]" #MSG_CRASHDETECT_OFF "Crash det. [off]" -"Rilevam.imp.[off]" +"Rileva.crash[off]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -556,7 +556,7 @@ #MSG_MESH_BED_LEVELING "Mesh Bed Leveling" -"Mesh livel. letto" +"Livel. piatto" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -588,11 +588,11 @@ #MSG_STEALTH_MODE_OFF "Mode [Normal]" -"Modo [normale]" +"Mod. [normale]" #MSG_SILENT_MODE_ON "Mode [silent]" -"Modo [silenzioso]" +"Mod. [silenziosa]" # "MMU needs user attention." @@ -604,15 +604,15 @@ #MSG_STEALTH_MODE_ON "Mode [Stealth]" -"Modo [Silenziosa]" +"Mod. [silenziosa]" #MSG_AUTO_MODE_ON "Mode [auto power]" -"Modo [auto]" +"Mod. [auto]" #MSG_SILENT_MODE_OFF "Mode [high power]" -"Mode [forte]" +"Mod. [forte]" # "MMU2 connected" @@ -976,7 +976,7 @@ #MSG_SORT_TIME c=17 r=1 "Sort [time]" -"Ordina [chron.]" +"Ordina [cron.]" # "Severe skew:" @@ -1416,7 +1416,7 @@ # "Sound [assist]" -"Suono [assistito]" +"Suono [assist.]" # "Steel sheets" From 2afeb65811da6fd862b3fe60be8f5e4f5164dfc0 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 19 Sep 2019 18:39:25 +0200 Subject: [PATCH 145/190] return failStatsFmt that fell out in merge --- Firmware/ultralcd.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6e513e2b0b..144fb91872 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1817,6 +1817,8 @@ static void lcd_menu_fails_stats_mmu_total() } #if defined(TMC2130) && defined(FILAMENT_SENSOR) +static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-7.7SX %-3d Y %-3d"; + //! @brief Show Total Failures Statistics MMU //! //! @code{.unparsed} From fd01942db8c7472ae309c13fe85f1d24db93a3c0 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 19 Sep 2019 20:48:59 +0300 Subject: [PATCH 146/190] FAN Error fix - Initial --- Firmware/Marlin.h | 5 ++++ Firmware/Marlin_main.cpp | 50 +++++++++++++++++++++------------------- Firmware/messages.c | 3 ++- Firmware/messages.h | 3 ++- Firmware/temperature.cpp | 18 +++++++-------- Firmware/temperature.h | 1 + Firmware/ultralcd.cpp | 15 ++++++++---- 7 files changed, 55 insertions(+), 40 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 625e079eaf..3c96cfc0d6 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -240,6 +240,11 @@ void prepare_move(); void kill(const char *full_screen_message = NULL, unsigned char id = 0); void Stop(); +#define PRINTING_TYPE_SD 0 +#define PRINTING_TYPE_USB 1 +#define PRINTING_TYPE_NONE 2 +extern uint8_t saved_printing_type; + bool IsStopped(); //put an ASCII command at the end of the current buffer. diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2423beafbe..b73ef5941e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -142,10 +142,6 @@ //Macro for print fan speed #define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms -#define PRINTING_TYPE_SD 0 -#define PRINTING_TYPE_USB 1 -#define PRINTING_TYPE_NONE 2 - //filament types #define FILAMENT_DEFAULT 0 #define FILAMENT_FLEX 1 @@ -378,7 +374,7 @@ boolean chdkActive = false; //! @{ bool saved_printing = false; //!< Print is paused and saved in RAM static uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing -static uint8_t saved_printing_type = PRINTING_TYPE_SD; +uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { 0, 0, 0, 0 }; //! Feedrate hopefully derived from an active block of the planner at the time the print has been canceled, in mm/min. static float saved_feedrate2 = 0; @@ -1751,12 +1747,22 @@ void loop() { is_usb_printing = false; } - + +#ifdef FANCHECK + if ((saved_printing_type == PRINTING_TYPE_USB) && fan_check_error) + { + process_commands(); //used to process pausing + KEEPALIVE_STATE(PAUSED_FOR_USER); + host_keepalive(); //prevent timeouts since usb processing is disabled until print is resumed. This is for a crude way of pausing a print on all hosts. + } + else +#endif if (prusa_sd_card_upload) { //we read byte-by byte serial_read_stream(); - } else + } + else { get_command(); @@ -3450,22 +3456,16 @@ extern uint8_t st_backlash_y; void process_commands() { - #ifdef FANCHECK - if (fan_check_error){ - if( fan_check_error == EFCE_DETECTED ){ - fan_check_error = EFCE_REPORTED; - - if(is_usb_printing){ - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); - } - else{ - lcd_pause_print(); - } - - } // otherwise it has already been reported, so just ignore further processing - return; - } - #endif +#ifdef FANCHECK + if(fan_check_error){ + if(fan_check_error == EFCE_DETECTED){ + fan_check_error = EFCE_REPORTED; + // SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); + lcd_pause_print(); + } // otherwise it has already been reported, so just ignore further processing + if(saved_printing_type == PRINTING_TYPE_USB) return; //ignore usb stream. + } +#endif if (!buflen) return; //empty command #ifdef FILAMENT_RUNOUT_SUPPORT @@ -10154,7 +10154,8 @@ void restore_print_from_ram_and_continue(float e_move) #ifdef FANCHECK // Do not allow resume printing if fans are still not ok - if( fan_check_error != EFCE_OK )return; + if ((fan_check_error != EFCE_OK) && (fan_check_error != EFCE_FIXED)) return; + if (fan_check_error == EFCE_FIXED) fan_check_error = EFCE_OK; //reenable serial stream processing if printing from usb #endif // for (int axis = X_AXIS; axis <= E_AXIS; axis++) @@ -10208,6 +10209,7 @@ void restore_print_from_ram_and_continue(float e_move) } SERIAL_PROTOCOLLNRPGM(MSG_OK); //dummy response because of octoprint is waiting for this lcd_setstatuspgm(_T(WELCOME_MSG)); + saved_printing_type = PRINTING_TYPE_NONE; saved_printing = false; } diff --git a/Firmware/messages.c b/Firmware/messages.c index 1c36e43c51..7803bb358d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -129,4 +129,5 @@ const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; //// const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; //// const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; //// const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; //// -const char MSG_OCTOPRINT_PAUSE[] PROGMEM_N1 = "// action:pause"; //// +const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; //// +const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index b48337efdd..a6525491dc 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -130,7 +130,8 @@ extern const char MSG_ERR_STOPPED[]; extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_EJECT_FILAMENT[]; extern const char MSG_CUT_FILAMENT[]; -extern const char MSG_OCTOPRINT_PAUSE[]; +extern const char MSG_OCTOPRINT_PAUSED[]; +extern const char MSG_OCTOPRINT_RESUMED[]; #if defined(__cplusplus) } diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 3c7f5fbc48..f88933a191 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -503,7 +503,7 @@ void checkFanSpeed() // drop the fan_check_error flag when both fans are ok if( fan_speed_errors[0] == 0 && fan_speed_errors[1] == 0 && fan_check_error == EFCE_REPORTED){ // we may even send some info to the LCD from here - fan_check_error = EFCE_OK; + fan_check_error = EFCE_FIXED; } if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled) { @@ -529,21 +529,21 @@ static void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){ } void fanSpeedError(unsigned char _fan) { - if (get_message_level() != 0 && isPrintPaused) return; - //to ensure that target temp. is not set to zero in case taht we are resuming print + if (get_message_level() != 0 && isPrintPaused) return; + //to ensure that target temp. is not set to zero in case that we are resuming print if (card.sdprinting || is_usb_printing) { if (heating_status != 0) { lcd_print_stop(); } else { - fan_check_error = EFCE_DETECTED; + fan_check_error = EFCE_DETECTED; //plans error for next processed command } } else { - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //for octoprint - setTargetHotend0(0); - heating_status = 0; - fan_check_error = EFCE_REPORTED; + // SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); //Why pause octoprint? is_usb_printing would be true in that case, so there is no need for this. + setTargetHotend0(0); + heating_status = 0; + fan_check_error = EFCE_REPORTED; } switch (_fan) { case 0: // extracting the same code from case 0 and case 1 into a function saves 72B @@ -553,7 +553,7 @@ void fanSpeedError(unsigned char _fan) { fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") ); break; } - SERIAL_PROTOCOLLNRPGM(MSG_OK); + // SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint. } #endif //(defined(TACH_0) && TACH_0 >-1) || (defined(TACH_1) && TACH_1 > -1) diff --git a/Firmware/temperature.h b/Firmware/temperature.h index 7f4daa2e4c..7c40eae651 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -241,6 +241,7 @@ void checkExtruderAutoFans(); enum { EFCE_OK = 0, //!< normal operation, both fans are ok + EFCE_FIXED, //!< previous fan error was fixed EFCE_DETECTED, //!< fan error detected, but not reported yet EFCE_REPORTED //!< fan error detected and reported to LCD and serial }; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0abdf1b597..87a64e72b9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1650,7 +1650,7 @@ void lcd_pause_print() { lcd_commands_type = LcdCommands::LongPause; } - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE); //pause for octoprint + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); //pause for octoprint } @@ -6322,13 +6322,14 @@ static void lcd_test_menu() void lcd_resume_print() { lcd_return_to_status(); - lcd_reset_alert_level(); + lcd_reset_alert_level(); lcd_setstatuspgm(_T(MSG_RESUMING_PRINT)); lcd_reset_alert_level(); //for fan speed error restore_print_from_ram_and_continue(0.0); pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation refresh_cmd_timeout(); isPrintPaused = false; + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint } static void change_sheet() @@ -6461,6 +6462,11 @@ static void lcd_main_menu() } +#ifdef FANCHECK + checkFanSpeed(); //Check manually to get most recent fan speed status + if((fan_check_error == EFCE_FIXED) && (saved_printing_type == PRINTING_TYPE_USB)) + MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT +#endif #ifdef SDSUPPORT if (card.cardOK || lcd_commands_type == LcdCommands::Layer1Cal) @@ -6475,9 +6481,8 @@ static void lcd_main_menu() else { #ifdef FANCHECK - checkFanSpeed(); //Check manually to get most recent fan speed status - if(fan_check_error == EFCE_OK) - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + if(fan_check_error == EFCE_FIXED) + MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT #else MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT #endif From 139c37c7448842fa5ffa6e647921b5df9f8d3659 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 20 Sep 2019 13:01:07 +0200 Subject: [PATCH 147/190] allow only one string translation constraint defintion per line --- Firmware/ultralcd.cpp | 44 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 144fb91872..77af6d5f49 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1742,7 +1742,8 @@ void lcd_menu_extruder_info() // NOT static due to using ins pat9125_update(); lcd_printf_P(_N( "Fil. Xd:%3d Yd:%3d\n" ////c=4 r=1 - "Int: %3d Shut: %3d" ////c=4 r=1 ////c=4 r=1 + "Int: %3d " ////c=4 r=1 + "Shut: %3d" ////c=4 r=1 ), pat9125_x, pat9125_y, pat9125_b, pat9125_s @@ -1790,7 +1791,10 @@ static void lcd_menu_fails_stats_mmu_print() uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Last print failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 + lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), + _i("Last print failures"), ////c=20 r=1 + _i("MMU fails"), fails, ////c=14 r=1 + _i("MMU load fails"), load_fails); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1812,7 +1816,11 @@ static void lcd_menu_fails_stats_mmu_total() uint8_t fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL_TOT); uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL_TOT); lcd_home(); - lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Total failures"), _i("MMU fails"), fails, _i("MMU load fails"), load_fails, _i("MMU power fails"), mmu_power_failures); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=14 r=1 + lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), + _i("Total failures"), ////c=20 r=1 + _i("MMU fails"), fails, ////c=14 r=1 + _i("MMU load fails"), load_fails, ////c=14 r=1 + _i("MMU power fails"), mmu_power_failures); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1838,7 +1846,11 @@ static void lcd_menu_fails_stats_total() uint16_t crashX = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT); uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); lcd_home(); - lcd_printf_P(failStatsFmt, _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=7 r=1 + lcd_printf_P(failStatsFmt, + _i("Total failures"), ////c=20 r=1 + _i("Power failures"), power, ////c=14 r=1 + _i("Filam. runouts"), filam, ////c=14 r=1 + _i("Crash"), crashX, crashY); ////c=7 r=1 menu_back_if_clicked_fb(); } @@ -1861,7 +1873,11 @@ static void lcd_menu_fails_stats_print() uint8_t crashX = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_X); uint8_t crashY = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_Y); lcd_home(); - lcd_printf_P(failStatsFmt, _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=7 r=1 + lcd_printf_P(failStatsFmt, + _i("Last print failures"), ////c=20 r=1 + _i("Power failures"), power, ////c=14 r=1 + _i("Filam. runouts"), filam, ////c=14 r=1 + _i("Crash"), crashX, crashY); ////c=7 r=1 menu_back_if_clicked_fb(); } @@ -1912,7 +1928,10 @@ static void lcd_menu_fails_stats() uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); lcd_home(); - lcd_printf_P(PSTR("Last print failures\n" " Filam. runouts %-3d\n" "Total failures\n" " Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=20 r=1 ////c=14 r=1 ////c=20 r=1 ////c=14 r=1 + lcd_printf_P(PSTR("Last print failures\n" ////c=20 r=1 + " Filam. runouts %-3d\n" ////c=14 r=1 + "Total failures\n" ////c=20 r=1 + " Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=14 r=1 menu_back_if_clicked(); } #else @@ -1948,7 +1967,10 @@ static void lcd_menu_debug() { #ifdef DEBUG_STACK_MONITOR lcd_home(); - lcd_printf_P(PSTR("RAM statistics\n" " SP_min: 0x%04x\n" " heap_start: 0x%04x\n" " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=20 r=1 ////c=14 r=1 ////c=14 r=1 ////c=14 r=1 + lcd_printf_P(PSTR("RAM statistics\n" ////c=20 r=1 + " SP_min: 0x%04x\n" ////c=14 r=1 + " heap_start: 0x%04x\n" ////c=14 r=1 + " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=14 r=1 #endif //DEBUG_STACK_MONITOR menu_back_if_clicked_fb(); @@ -2859,7 +2881,9 @@ void lcd_menu_statistics() "%17.2fm \n" "%S:\n" "%2dh %02dm %02ds" - ),_i("Filament used"), _met, _i("Print time"), _h, _m, _s); ////c=18 r=1 ////c=18 r=1 + ), + _i("Filament used"), _met, ////c=18 r=1 + _i("Print time"), _h, _m, _s); ////c=18 r=1 menu_back_if_clicked_fb(); } else @@ -4752,7 +4776,9 @@ void lcd_v2_calibration() { 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 + const uint8_t filament = choose_menu_P( + _i("Select PLA filament:"), ////c=20 r=1 + _T(MSG_FILAMENT),_i("Cancel")); ////c=19 r=1 if (filament < 5) { lcd_commands_step = 20 + filament; From 2363f19a626bc3d9921c13044dec7c375fe4e39a Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 20 Sep 2019 21:07:20 +0300 Subject: [PATCH 148/190] Minor tweaks for usb printing --- Firmware/Marlin.h | 9 ++++----- Firmware/Marlin_main.cpp | 6 +++++- Firmware/ultralcd.cpp | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 3c96cfc0d6..ee7f15d8cc 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -240,11 +240,6 @@ void prepare_move(); void kill(const char *full_screen_message = NULL, unsigned char id = 0); void Stop(); -#define PRINTING_TYPE_SD 0 -#define PRINTING_TYPE_USB 1 -#define PRINTING_TYPE_NONE 2 -extern uint8_t saved_printing_type; - bool IsStopped(); //put an ASCII command at the end of the current buffer. @@ -381,6 +376,10 @@ extern char dir_names[3][9]; extern int8_t lcd_change_fil_state; // save/restore printing extern bool saved_printing; +extern uint8_t saved_printing_type; +#define PRINTING_TYPE_SD 0 +#define PRINTING_TYPE_USB 1 +#define PRINTING_TYPE_NONE 2 //save/restore printing in case that mmu is not responding extern bool mmu_print_saved; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b73ef5941e..3e1372edbf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1747,6 +1747,10 @@ void loop() { is_usb_printing = false; } + if (isPrintPaused && saved_printing_type == PRINTING_TYPE_USB) //keep believing that usb is being printed. Prevents accessing dangerous menus while pausing. + { + is_usb_printing = true; + } #ifdef FANCHECK if ((saved_printing_type == PRINTING_TYPE_USB) && fan_check_error) @@ -3463,7 +3467,7 @@ void process_commands() // SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); lcd_pause_print(); } // otherwise it has already been reported, so just ignore further processing - if(saved_printing_type == PRINTING_TYPE_USB) return; //ignore usb stream. + return; //ignore usb stream. It is reenabled by selecting resume from the lcd. } #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 87a64e72b9..0fb1d3de63 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6847,6 +6847,7 @@ void lcd_print_stop() SERIAL_ECHOLNPGM("// action:cancel"); // for Octoprint } saved_printing = false; + saved_printing_type = PRINTING_TYPE_NONE; cancel_heatup = true; #ifdef MESH_BED_LEVELING mbl.active = false; From 5edbc66aac4f8b71355fdab85ccecac9546d8002 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 22 Sep 2019 12:52:02 +0200 Subject: [PATCH 149/190] French translation has different `c=` value than the English `lang_en.txt` file. --- lang/lang_en_fr.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d3256935a1..094cb1340e 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -62,7 +62,7 @@ "Auto home" "Mise a 0 des axes" -#MSG_AUTOLOAD_FILAMENT c=18 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "Autocharge du fil." From 903ab3a19296c98671b79bbcf964e814c9105cfa Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 22 Sep 2019 12:55:43 +0200 Subject: [PATCH 150/190] Czech translation is missing `:` compared to English `lang_en.txt` file at `#MSG_SELFTEST_PRINT_FAN_SPEED c=18` --- lang/lang_en_cz.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 2b5c5540ce..0240737b5f 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -819,8 +819,8 @@ "Predehrev k vyjmuti" #MSG_SELFTEST_PRINT_FAN_SPEED c=18 -"Print fan" -"Tiskovy vent." +"Print fan:" +"Tiskovy vent.:" #MSG_CARD_MENU "Print from SD" From df2eced5e07a799677f16fa621f08dfedfcd8fa4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 22 Sep 2019 12:58:20 +0200 Subject: [PATCH 151/190] Polish translation is missing a `LF` compared to English `lang_en.txt` file. --- lang/lang_en_pl.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index e3d434d7cd..da275fa190 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1413,6 +1413,7 @@ # "Sheet" "Plyta" + # "Sound [assist]" "Dzwiek [asyst.]" From 3c17f7e145ab6cf346f02732f3c0193d217b1516 Mon Sep 17 00:00:00 2001 From: leptun Date: Sun, 22 Sep 2019 14:04:58 +0300 Subject: [PATCH 152/190] No need to check the fan in the menu --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0fb1d3de63..1d970368a4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6463,7 +6463,6 @@ static void lcd_main_menu() #ifdef FANCHECK - checkFanSpeed(); //Check manually to get most recent fan speed status if((fan_check_error == EFCE_FIXED) && (saved_printing_type == PRINTING_TYPE_USB)) MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT #endif From 0a4b16a7e70ce504d0db949d35466a81eec2c410 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 22 Sep 2019 14:45:59 +0200 Subject: [PATCH 153/190] I run two lang scripts to show an issue which i will report as well - ran `/lang/lang-export.sh` - copied `/lang/po/Firmware_xx.po` files to `/lang/po/new` as `xx.po` files - ran `/lang/lang-import.sh` - cleandup `/lang/po/new` folder --- lang/po/Firmware.pot | 477 ++++---- lang/po/Firmware_cs.po | 519 ++++----- lang/po/Firmware_de.po | 551 ++++----- lang/po/Firmware_es.po | 541 ++++----- lang/po/Firmware_fr.po | 790 ++++++------- lang/po/Firmware_it.po | 581 +++++----- lang/po/Firmware_pl.po | 579 +++++----- lang/po/new/cs.po | 2217 ++++++++++++------------------------ lang/po/new/de.po | 2261 +++++++++++++------------------------ lang/po/new/es.po | 2264 +++++++++++++------------------------ lang/po/new/fr.po | 2439 ++++++++++++++-------------------------- lang/po/new/it.po | 2284 +++++++++++++------------------------ lang/po/new/pl.po | 2270 +++++++++++++------------------------ 13 files changed, 6691 insertions(+), 11082 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index d2e5bfd165..6229d032d7 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: Wed Sep 4 16:13:32 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:13:32 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:01:55 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:01:55 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "" @@ -41,17 +41,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr "" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "" @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2771 +#: ultralcd.cpp:2813 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "" @@ -151,7 +151,7 @@ msgid "Bed" msgstr "" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "" @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "" @@ -226,7 +226,7 @@ msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "" @@ -256,22 +256,22 @@ msgid "Crash detected. Resume print?" msgstr "" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "" @@ -281,12 +281,12 @@ 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:4984 +#: ultralcd.cpp:5070 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "" @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" @@ -336,12 +336,12 @@ msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "" @@ -351,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" msgstr "" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "" @@ -366,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "" @@ -386,12 +386,12 @@ msgid "Fan test" msgstr "" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "" @@ -401,7 +401,7 @@ msgid "Fil. sensor [on]" msgstr "" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "" @@ -411,7 +411,7 @@ msgid "Fil. sensor [off]" msgstr "" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "" @@ -421,7 +421,7 @@ msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "" @@ -456,7 +456,7 @@ msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" @@ -466,12 +466,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "" @@ -511,12 +511,12 @@ msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "" @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "" @@ -586,17 +586,17 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4913 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "" # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4978 +#: ultralcd.cpp:5064 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 "" @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "" @@ -651,17 +651,17 @@ msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "" @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "" @@ -711,7 +711,7 @@ msgid "Measuring reference height of calibration point" msgstr "" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "" @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" msgstr "" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "" @@ -766,7 +766,7 @@ msgid "MMU needs user attention." msgstr "" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "" @@ -786,7 +786,7 @@ msgid "Mode [high power]" msgstr "" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "" @@ -836,7 +836,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "" @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "" @@ -871,37 +871,37 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "" # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "" @@ -911,7 +911,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 msgstr "" # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "" @@ -921,7 +921,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "" # MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: ultralcd.cpp:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "" @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." msgstr "" @@ -976,7 +976,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "" @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "" @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "" @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "" @@ -1031,17 +1031,17 @@ msgid "Print aborted" msgstr "" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" msgstr "" @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "" @@ -1071,22 +1071,22 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "" # -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" msgstr "" # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "" @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "" @@ -1161,27 +1161,27 @@ msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "" @@ -1196,17 +1196,17 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5045 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "" @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "" @@ -1231,22 +1231,22 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "" # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" msgstr "" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" msgstr "" # -#: ultralcd.cpp:3008 -msgid "Severe skew" +#: ultralcd.cpp:3062 +msgid "Severe skew:" msgstr "" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "" @@ -1261,8 +1261,8 @@ msgid "Sound [loud]" msgstr "" # -#: ultralcd.cpp:3007 -msgid "Slight skew" +#: ultralcd.cpp:3061 +msgid "Slight skew:" msgstr "" # MSG_SOUND_MUTE c=17 r=1 @@ -1271,7 +1271,7 @@ msgid "Sound [mute]" msgstr "" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" @@ -1286,7 +1286,7 @@ msgid "Sound [silent]" msgstr "" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "" @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "" # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" msgstr "" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "" @@ -1371,37 +1371,37 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "" @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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 "" @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "" @@ -1506,62 +1506,62 @@ msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3838 +#: ultralcd.cpp:3922 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3835 +#: ultralcd.cpp:3919 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" # -#: ultralcd.cpp:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" msgstr "" @@ -1576,32 +1576,32 @@ msgid "Back" msgstr "" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" msgstr "" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" msgstr "" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" msgstr "" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" msgstr "" @@ -1611,37 +1611,37 @@ msgid "HW Setup" msgstr "" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" msgstr "" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" msgstr "" @@ -1651,62 +1651,62 @@ msgid "MK3S firmware detected on MK3 printer" msgstr "" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" msgstr "" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "" # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" msgstr "" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" msgstr "" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" msgstr "" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" msgstr "" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" msgstr "" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" msgstr "" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" msgstr "" @@ -1741,17 +1741,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "" # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" msgstr "" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" msgstr "" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" msgstr "" @@ -1766,17 +1766,17 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "" # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "" @@ -1786,22 +1786,27 @@ msgid "Sheet" msgstr "" # -#: -msgid "Sound [assist]" +#: sound.h:9 +msgid "Sound [assist]" msgstr "" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" msgstr "" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "" +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "" + diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index c9130c600e..9cb47a37c5 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: Wed Sep 4 16:13:39 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:13:39 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:03:01 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:03:01 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -41,17 +41,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Dostavovani Z:" +msgstr "Doladeni Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Vse OK " @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 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:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "SpoolJoin [vyp]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 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:2771 +#: ultralcd.cpp:2813 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:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -133,10 +133,10 @@ msgstr "Bed OK." # MSG_BED_HEATING #: messages.c:17 msgid "Bed Heating" -msgstr "Zahrivani bed" +msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -151,7 +151,7 @@ msgid "Bed" msgstr "Podlozka" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Stav remenu" @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Kalibrace OK" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Zrusit" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Barva neni cista" @@ -226,7 +226,7 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" @@ -256,22 +256,22 @@ msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Vypnout motory" @@ -281,12 +281,12 @@ 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:4984 +#: ultralcd.cpp:5070 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=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Korekce E:" @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "Vysunout filament" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "Vysunout" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." @@ -336,12 +336,12 @@ msgid "ERROR:" msgstr "CHYBA:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "" @@ -351,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" msgstr "Selhani MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -366,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Selhani" @@ -386,12 +386,12 @@ msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -401,7 +401,7 @@ msgid "Fil. sensor [on]" msgstr "Fil. senzor [zap]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -411,9 +411,9 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" -msgstr "Vypadky filamentu" +msgstr "Vypadky filam." # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 @@ -421,7 +421,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Filament nezaveden" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "Senzor filamentu" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Spotrebovano filamentu" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Cas tisku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -456,7 +456,7 @@ msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." @@ -466,12 +466,12 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Vymena ok?" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "Kontrola hotend " @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Kontrola osy Z" @@ -586,17 +586,17 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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:4913 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4978 +#: ultralcd.cpp:5064 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." @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "Informace" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "Je filament 1 zaveden?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "Posledni tisk" @@ -651,17 +651,17 @@ msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" -msgstr "Vlevo:" +msgstr "Vlevo" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Korekce lin." @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Cisteni barvy" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "Zavest do trysky" @@ -711,7 +711,7 @@ msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "" @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" msgstr "Merene zkoseni" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Selhani MMU" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "MMU selhani zavadeni" @@ -766,7 +766,7 @@ msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "MMU vypadky proudu" @@ -786,7 +786,7 @@ msgid "Mode [high power]" msgstr "Mod [vys. vykon]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU2 pripojeno" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Zadna SD karta" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "" @@ -836,7 +836,7 @@ msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Nezapojeno " @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." @@ -871,37 +871,37 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Trysk. vent." +msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pozastavit tisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Nahrivani PINDA" @@ -911,7 +911,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -921,7 +921,7 @@ 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:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Zkontrolujte :" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." @@ -976,7 +976,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." @@ -1001,14 +1001,14 @@ msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Predehrev" # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." -msgstr "Predehrivam trysku. Prosim cekejte." +msgstr "Predehrev trysky. Prosim cekejte." # #: util.cpp:297 @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "Vypadky proudu" @@ -1031,17 +1031,17 @@ msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" -msgstr "Predehrivam k zavedeni" +msgstr "Predehrev k zavedeni" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" -msgstr "Predehrivam k vyjmuti" +msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Tisk pozastaven" @@ -1071,22 +1071,22 @@ 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:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" msgstr "Tiskovy vent." # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Obnovovani tisku " @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Pokracovat" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Vpravo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Vpravo" @@ -1161,27 +1161,27 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Chyba Selftestu!" @@ -1196,17 +1196,17 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5045 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "Vyberte PLA filament:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Stav senzoru" @@ -1231,22 +1231,22 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" msgstr "Trideni [Zadne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" msgstr "Trideni [cas]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Tezke zkoseni" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Tezke zkoseni:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "Trideni [Abeceda]" @@ -1261,9 +1261,9 @@ msgid "Sound [loud]" msgstr "Zvuk [hlasity]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Lehke zkoseni" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Lehke zkoseni:" # MSG_SOUND_MUTE c=17 r=1 #: @@ -1271,7 +1271,7 @@ msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." @@ -1286,7 +1286,7 @@ msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Rychlost" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Statistika " @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Prohozene" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Teploty" @@ -1371,37 +1371,37 @@ 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:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Vysunout" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "k vyjmuti filamentu" @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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." @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1506,69 +1506,69 @@ 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:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "Zavest vse" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" msgstr "Korekce Y:" # MSG_OFF #: menu.cpp:426 msgid " [off]" -msgstr "" +msgstr " [vyp]" # #: messages.c:57 @@ -1576,32 +1576,32 @@ msgid "Back" msgstr "Zpet" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" msgstr "Kontrola" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "Falesne spusteni" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" msgstr "" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "Firmware [Zadne]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" msgstr "Firmware [Prisne]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" msgstr "Firmware[Varovat]" @@ -1611,102 +1611,102 @@ msgid "HW Setup" msgstr "HW nastaveni" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" msgstr "Komp. magnetu[N/A]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "Komp. magnetu[Vyp]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "Komp. magnetu[Zap]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "Mesh [3x3]" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "Mesh [7x7]" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" msgstr "Mesh Bed Leveling" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "MK3S firmware detekovan na tiskarne MK3" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "MMU mod [Normal]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" msgstr "MMU Mod [Tichy]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "Probiha zmena modu..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "Model [Zadne]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" msgstr "Model [Prisne]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" msgstr "Model [Varovat]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" msgstr "Tryska [0.25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" msgstr "Tryska [0.40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" msgstr "Tryska [0.60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "Tryska [Zadne]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" msgstr "Tryska [Prisne]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" msgstr "Tryska [Varovat]" @@ -1723,37 +1723,37 @@ msgstr "" # #: util.cpp:427 msgid "G-code sliced for a different printer type. Continue?" -msgstr "" +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 "" +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 "" +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 "" +msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" msgstr "" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" -msgstr "Predehrivam k ustrizeni" +msgstr "Predehrev k ustrizeni" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" -msgstr "Predehrivam k vysunuti" +msgstr "Predehrev k vysunuti" # #: util.cpp:390 @@ -1766,42 +1766,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "Prejmenovat" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "Vybrat" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "Senzor info" # #: messages.c:58 msgid "Sheet" -msgstr "Plech" +msgstr "Plat" # -#: -msgid "Sound [assist]" -msgstr "Zvuk [asistence]" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Zvuk [Asist.]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "Tiskove plechy" +msgstr "Tiskove platy" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Korekce Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Pocet mereni Z [1]" +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Pocet mereni Z [3]" + diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 6107cef80d..cc48790360 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: Wed Sep 4 16:13:46 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:13:46 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:04:09 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:04:09 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -41,19 +41,19 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Abbruch" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " -msgstr "Alles richtig " +msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 #: messages.c:101 @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 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:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "SpoolJoin [N/V]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "SpoolJoin [aus]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "Auto-Laden Filament" +msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 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:2771 +#: ultralcd.cpp:2813 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:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -151,7 +151,7 @@ msgid "Bed" msgstr "Bett" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Gurtstatus" @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Kalibrierung OK" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Abbruch" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Falsche Farbe" @@ -226,7 +226,7 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" @@ -256,22 +256,22 @@ msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Motoren aus" @@ -281,12 +281,12 @@ 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:4984 +#: ultralcd.cpp:5070 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=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "E-Korrektur:" @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "Filamentauswurf" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "Auswurf" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -336,12 +336,12 @@ msgid "ERROR:" msgstr "FEHLER:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "Extruder Info" @@ -351,12 +351,12 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" msgstr "MMU-Fehler" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -366,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Fehlerstatistik" @@ -386,12 +386,12 @@ msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -401,7 +401,7 @@ msgid "Fil. sensor [on]" msgstr "Fil. Sensor [an]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -411,17 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. Maengel" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament extrudiert + richtige Farbe?" +msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. nicht geladen" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "Filamentsensor" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Druckzeit" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -456,7 +456,7 @@ msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 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." @@ -466,12 +466,12 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Wechsel ok?" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "Pruefe Duese " @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Pruefe Z Achse " @@ -586,17 +586,17 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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:4913 +#: ultralcd.cpp:4999 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:4978 +#: ultralcd.cpp:5064 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." @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "Infoanzeige" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "Wurde Filament 1 geladen?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "Letzter Druck" @@ -651,17 +651,17 @@ msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Lade Farbe" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "In Druckduese laden" @@ -711,14 +711,14 @@ msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh Bett Ausgleich" +msgstr "MeshBett Ausgleich" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 #: mmu.cpp:762 msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Position wiederherstellen... " +msgstr "MMU OK. Position wiederherstellen..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 #: mmu.cpp:755 @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" msgstr "Schraeglauf" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "MMU Fehler" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "MMU Ladefehler" @@ -766,7 +766,7 @@ msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "MMU Netzfehler" @@ -786,7 +786,7 @@ msgid "Mode [high power]" msgstr "Modus[Hohe Leist]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU2 verbunden" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Keine SD Karte" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "N.V." @@ -836,7 +836,7 @@ msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." @@ -871,37 +871,37 @@ 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:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Duesen Luefter" +msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Druck pausieren" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "PINDA erwaermen" @@ -911,7 +911,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -921,7 +921,7 @@ 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:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Bitte pruefe:" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." @@ -976,7 +976,7 @@ 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:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Vorheizen" @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "Netzfehler" @@ -1031,17 +1031,17 @@ msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "Heizen zum Laden" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" msgstr "Druckvent.:" @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" -msgstr "Knopf druecken" +msgstr "Knopf druecken zum" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Druck pausiert" @@ -1071,22 +1071,22 @@ 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:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" -msgstr "Druckluefter" +msgstr "Druckvent." # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Druck wiederherst " @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." -msgstr "XYZ Kalibr. zuruecksetzen." +msgstr "Reset XYZ Kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Druck fortsetzen" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Rechts [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "SD Karte [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Rechts" @@ -1161,34 +1161,34 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 msgid "Selftest failed " -msgstr "Selbsttest misslang" +msgstr "Selbsttest Error " # MSG_FORCE_SELFTEST c=20 r=8 #: Marlin_main.cpp:1551 @@ -1196,17 +1196,17 @@ 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:4959 +#: ultralcd.cpp:5045 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "PLA Filament auswaehlen:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Sensorstatus" @@ -1231,22 +1231,22 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Sort. [Keine]" +msgstr "Sort. [ohne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" msgstr "Sort. [Zeit]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Schwerer Schraeglauf" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Schwer.Schr:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "Sort. [Alphabet]" @@ -1261,9 +1261,9 @@ msgid "Sound [loud]" msgstr "Sound [laut]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Leichter Schraeglauf" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Leicht.Schr:" # MSG_SOUND_MUTE c=17 r=1 #: @@ -1271,7 +1271,7 @@ msgid "Sound [mute]" msgstr "Sound [stumm]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." @@ -1286,7 +1286,7 @@ msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Geschwindigkeit" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Statistiken " @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Ausgetauscht" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Temp. Kal. [AN]" +msgstr "Temp. Kal. [an]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Temp. Kal. [AUS]" +msgstr "Temp. Kal. [aus]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperaturen" @@ -1371,39 +1371,39 @@ 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:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Entladen" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" -msgstr "zum Filament laden" +msgstr "Filament laden" # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" -msgstr "zum Filament entladen" +msgstr "Filament entladen" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 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:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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." @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1506,52 +1506,52 @@ 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:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "Alle laden" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." @@ -1561,19 +1561,19 @@ msgid "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nich msgstr # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" msgstr "Y-Korrektur:" # MSG_OFF #: menu.cpp:426 msgid " [off]" -msgstr "" +msgstr " [aus]" # #: messages.c:57 @@ -1581,34 +1581,34 @@ msgid "Back" msgstr "Zurueck" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" -msgstr "" +msgstr "Kontrolle" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "Falschtriggerung" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" msgstr "" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "Firmware [ohne]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" -msgstr "Firmware [streng]" +msgstr "Firmware [strikt]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" -msgstr "" +msgstr "Firmware [warnen]" # #: messages.c:87 @@ -1616,147 +1616,147 @@ msgid "HW Setup" msgstr "HW Einstellungen" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" msgstr "Magnet Komp. [nv]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "Magnet Komp. [Aus]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "Magnet Komp. [An]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" -msgstr "" +msgstr "Gitter [3x3]" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" -msgstr "" +msgstr "Gitter [7x7]" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" -msgstr "Mesh Bett Ausgleich" +msgstr "MeshBett Ausgleich" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "MMU Modus[Normal]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" msgstr "MMU Mod.[Stealth]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "Moduswechsel erfolgt..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "Modell [ohne]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" -msgstr "Modell [streng]" +msgstr "Modell [strikt]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" -msgstr "Modell [warn]" +msgstr "Modell [warnen]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" msgstr "Duese D. [0.25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" msgstr "Duese D. [0.40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" msgstr "Duese D. [0.60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "Duese [ohne]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" -msgstr "Duese [streng]" +msgstr "Duese [strikt]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" -msgstr "Duese [warn]" +msgstr "Duese [warnen]" # #: util.cpp:510 msgid "G-code sliced for a different level. Continue?" -msgstr "" +msgstr "G-Code ist fuer 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 "" +msgstr "G-Code ist fuer 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 "" +msgstr "G-Code ist fuer 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 "" +msgstr "G-Code ist fuer 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 "" +msgstr "G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" # #: util.cpp:483 msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "" +msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" msgstr "" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" @@ -1771,17 +1771,17 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "Umbenennen" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "Auswahl" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "Sensor Info" @@ -1791,22 +1791,27 @@ msgid "Sheet" msgstr "Blech" # -#: -msgid "Sound [assist]" -msgstr "" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Sound [Assist]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "" +msgstr "Stahlbleche" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Z-Korrektur:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Z-Probe Nr. [1]" +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Z-Probe Nr. [3]" + diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 9262867e23..e7d5154133 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: Wed Sep 4 16:13:52 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:13:52 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:05:16 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:05:16 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -41,17 +41,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Cancelar" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Ajustar Z:" +msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Todo bien" @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 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:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 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:2771 +#: ultralcd.cpp:2813 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:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -148,10 +148,10 @@ msgstr "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando re # MSG_BED #: messages.c:15 msgid "Bed" -msgstr "Base calefactable " +msgstr "Base" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Estado de la correa" @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Calibracion OK" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Cancelar" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Color no homogeneo" @@ -226,7 +226,7 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" @@ -256,22 +256,22 @@ msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Apagar motores" @@ -281,14 +281,14 @@ 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:4984 +#: ultralcd.cpp:5070 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=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" -msgstr "E-correcion:" +msgstr "Corregir-E:" # MSG_EJECT_FILAMENT c=17 r=1 #: messages.c:53 @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "Expulsar filamento" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "Expulsar" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 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:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -336,12 +336,12 @@ msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" -msgstr "Ventilador del extrusor:" +msgstr "Vent.extrusor:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "Informacion del extrusor" @@ -351,12 +351,12 @@ msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -366,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Estadistica de fallos" @@ -386,12 +386,12 @@ msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -401,7 +401,7 @@ msgid "Fil. sensor [on]" msgstr "Sensor Fil. [act]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -411,7 +411,7 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. acabado" @@ -421,7 +421,7 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. no introducido" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "Sensor de filamento" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Tiempo de imp.:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -456,7 +456,7 @@ msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 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." @@ -466,12 +466,12 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Cambio correcto?" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "Control fusor" @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "Comprobando los sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Control sensor Z" @@ -586,17 +586,17 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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:4913 +#: ultralcd.cpp:4999 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:4978 +#: ultralcd.cpp:5064 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." @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "Monitorizar" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "?Esta cargado el filamento 1?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "?Esta colocada la lamina de acero sobre la base?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "Ultima impresion" @@ -651,17 +651,17 @@ msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Cambiando color" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "Cargar a la boquilla" @@ -711,7 +711,7 @@ msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" -msgstr "Desviacion medida:" +msgstr "Desviacion med:" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Fallos MMU" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Carga MMU falla" @@ -766,7 +766,7 @@ msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "Fallo de energia en MMU" @@ -786,7 +786,7 @@ msgid "Mode [high power]" msgstr "Modo [rend.pleno]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU2 conectado" @@ -796,39 +796,39 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "No hay tarjeta SD" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" -msgstr "No disponible" +msgstr "N/A" # MSG_NO #: messages.c:62 @@ -836,7 +836,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "No hay conexion " @@ -851,14 +851,14 @@ msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." -msgstr "Voy a precalentar la boquilla para PLA ahora." +msgstr "Ahora precalentare la boquilla para PLA." # MSG_NOZZLE #: messages.c:63 @@ -871,37 +871,37 @@ 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:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Ventilador de capa" +msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pausar impresion" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Calentando PINDA" @@ -911,7 +911,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -921,7 +921,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Controla :" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." @@ -976,7 +976,7 @@ 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:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Precalentar" @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "Cortes de energia" @@ -1031,19 +1031,19 @@ msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "Precalentar para cargar" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" msgstr "Precalentar para descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventilador del fusor:" +msgstr "Vent.fusor:" # MSG_CARD_MENU #: messages.c:21 @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "Pulsa el dial" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Impresion en pausa" @@ -1071,22 +1071,22 @@ 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:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" -msgstr "Ventilador del extrusor" +msgstr "Vent.extr" # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recuperando impresion" @@ -1101,57 +1101,57 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 r=1 #: messages.c:73 msgid "Resuming print" -msgstr "Resumiendo impresion" +msgstr "Continuando impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Derecha [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Derecha" @@ -1161,27 +1161,27 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Error Selftest !" @@ -1196,17 +1196,17 @@ 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:4959 +#: ultralcd.cpp:5045 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:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "Seleccionar filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Estado del sensor" @@ -1231,22 +1231,22 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Ordenar [nada]" +msgstr "Ordenar [ninguno]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" -msgstr "Ordenar [Fecha]" +msgstr "Ordenar [fecha]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Inclinacion severa" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Incl.severa:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "Ordenar [alfabet]" @@ -1261,9 +1261,9 @@ msgid "Sound [loud]" msgstr "Sonido [alto]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Ligeramente inclinado" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Liger.incl.:" # MSG_SOUND_MUTE c=17 r=1 #: @@ -1271,7 +1271,7 @@ msgid "Sound [mute]" msgstr "Sonido[silenciad]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." @@ -1286,7 +1286,7 @@ msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Velocidad" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Estadisticas " @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Intercambiado" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Cal. temp. [ON]" +msgstr "Cal. temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Cal. temp. [OFF]" +msgstr "Cal. temp. [off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibracion temperatura terminada. Haz clic para continuar." # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperaturas" @@ -1371,37 +1371,37 @@ 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:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filamento total:" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Tiempo total :" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Descargar" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "para descargar el filamento" @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 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:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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" @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" @@ -1506,69 +1506,69 @@ 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:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" -msgstr "X-correcion:" +msgstr "Corregir-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "Intr. todos fil." # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" -msgstr "Y-correcion:" +msgstr "Corregir-Y:" # MSG_OFF #: menu.cpp:426 msgid " [off]" -msgstr "" +msgstr "[apag]" # #: messages.c:57 @@ -1576,32 +1576,32 @@ msgid "Back" msgstr "atras" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" msgstr "Comprobaciones" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "Falsa activacion" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" -msgstr "" +msgstr "FINDA:" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "Firmware[ninguno]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" msgstr "Firmware[estrict]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" msgstr "Firmware [aviso]" @@ -1611,147 +1611,147 @@ msgid "HW Setup" msgstr "Configuracion HW" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" msgstr "Comp. imanes [N/A]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "Comp. imanes [Off]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "Comp. imanes [On]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "Malla [3x3]" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "Malla [7x7]" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" msgstr "Nivelacion Malla Base" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "Firmware MK3S detectado en impresora MK3" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "Modo MMU [Normal]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" msgstr "Modo MMU[Silenci]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "Cambio de modo progresando ..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "Modelo [ninguno]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" msgstr "Modelo [estricto]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" msgstr "Modelo [aviso]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" msgstr "Diam. nozzl[0.25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" msgstr "Diam. nozzl[0.40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" msgstr "Diam. nozzl[0.60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "Nozzle [ninguno]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" msgstr "Nozzle [estricto]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" msgstr "Nozzle [aviso]" # #: util.cpp:510 msgid "G-code sliced for a different level. Continue?" -msgstr "" +msgstr "Codigo 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 "" +msgstr "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." # #: util.cpp:427 msgid "G-code sliced for a different printer type. Continue?" -msgstr "" +msgstr "Codigo 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 "" +msgstr "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." # #: util.cpp:477 msgid "G-code sliced for a newer firmware. Continue?" -msgstr "" +msgstr "Codigo G laminado para nuevo firmware. ?Continuar?" # #: util.cpp:483 msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "" +msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" -msgstr "" +msgstr "PINDA:" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" msgstr "Precalentando para laminar" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" msgstr "Precalentar para expulsar" @@ -1766,17 +1766,17 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "Renombrar" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "Seleccionar" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "Info sensor" @@ -1786,22 +1786,27 @@ msgid "Sheet" msgstr "Lamina" # -#: -msgid "Sound [assist]" -msgstr "" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Sonido [asistido]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "" +msgstr "Lamina de acero" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" -msgstr "Correccion-Z:" +msgstr "Corregir-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Z-sensor nr. [1]" +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Z-sensor nr. [3]" + diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index dea1b4c294..df3f51df42 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: Wed Sep 4 16:13:59 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:13:59 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:06:22 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:06:22 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr "de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -38,55 +38,55 @@ msgstr "La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #: msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode Furtif" +msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Annuler" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Ajust. de Z:" +msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 #: messages.c:101 msgid "All is done. Happy printing!" -msgstr "Tout est pret. Bonne impression !" +msgstr "Tout est pret. Bonne impression!" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "AutoCharge du filament" +msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2771 +#: ultralcd.cpp:2813 msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "Chargement auto du filament actif, appuyez sur le btn et inserez le fil." +msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -136,14 +136,14 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" 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 bed leveling. Capt. non declenche. Debris sur buse ? 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 @@ -151,22 +151,22 @@ msgid "Bed" msgstr "Lit" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 #: messages.c:71 msgid "Blackout occurred. Recover print?" -msgstr "Coupure detectee. Recup. impression ?" +msgstr "Coupure detectee. Reprendre impression?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -176,27 +176,27 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." +msgstr "Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_CALIBRATE_Z_AUTO c=20 r=2 #: messages.c:20 msgid "Calibrating Z" -msgstr "Calibration de Z" +msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." +msgstr "Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Calibration terminee" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Annuler" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -226,24 +226,24 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" -msgstr "Copier la langue selectionne ?" +msgstr "Copier la langue selectionne?" # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" -msgstr "Detect. crash[on]" +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 @@ -253,25 +253,25 @@ msgstr "Crash detecte." # #: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" -msgstr "Crash detecte. Poursuivre l'impression ?" +msgstr "Crash detecte. Poursuivre l'impression?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" -msgstr "Date :" +msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -281,67 +281,67 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y 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:4984 +#: ultralcd.cpp:5070 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 plateau chauffant ?" +msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Correct-E:" # MSG_EJECT_FILAMENT c=17 r=1 #: messages.c:53 msgid "Eject filament" -msgstr "Ejecter le fil." +msgstr "Remonter le fil." # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" -msgstr "Ejecter" +msgstr "Remonter" # MSG_EJECTING_FILAMENT c=20 r=1 #: mmu.cpp:1434 msgid "Ejecting filament" -msgstr "Ejection filament" +msgstr "Le fil. remonte" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 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:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERREUR : Le capteur de filament ne repond pas, verifiez le branchement." +msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." # MSG_ERROR #: messages.c:28 msgid "ERROR:" -msgstr "ERREUR :" +msgstr "ERREUR:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "Infos extrudeur" @@ -351,49 +351,49 @@ msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" -msgstr "Stat. echecs MMU" +msgstr "Stat. d'echec MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "ChargAuto f. [on]" +msgstr "Autochargeur [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 msgid "F. autoload [N/A]" -msgstr "AutoCharg F [N/A]" +msgstr "Autochargeur[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" -msgstr "AutoCharg F [off]" +msgstr "Autochargeur[off]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" -msgstr "Statist. d'echec" +msgstr "Stat. d'echec" # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" -msgstr "Vitesse ventil" +msgstr "Vitesse vent." # MSG_SELFTEST_FAN c=20 #: messages.c:78 msgid "Fan test" -msgstr "Test ventilateur" +msgstr "Test du ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" -msgstr "Verif ventilo[on]" +msgstr "Verif vent. [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" -msgstr "Verif venti [off]" +msgstr "Verif vent. [off]" # MSG_FSENSOR_ON #: messages.c:45 @@ -401,9 +401,9 @@ msgid "Fil. sensor [on]" msgstr "Capteur Fil. [on]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" -msgstr "Capteur Fil. [N/A]" +msgstr "Capteur Fil.[N/A]" # MSG_FSENSOR_OFF #: messages.c:44 @@ -411,17 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Fins de filament" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament extrude et avec bonne couleur ?" +msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Filament non charge" @@ -431,24 +431,24 @@ msgid "Filament sensor" msgstr "Capteur de filament" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Temps d'impression" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" -msgstr "Fichier incomplet. Continuer qd meme ?" +msgstr "Fichier incomplet. Continuer qd meme?" # MSG_FINISHING_MOVEMENTS c=20 r=1 #: messages.c:40 msgid "Finishing movements" -msgstr "Mouvements de fin" +msgstr "Mouvement final" # MSG_V2_CALIBRATION c=17 r=1 #: messages.c:105 @@ -456,49 +456,49 @@ msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." -msgstr "D'abord, je vais lancer le Selftest pour verifier les problemes d'assemblage les plus communs." +msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." # #: 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." +msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 msgid "Front print fan?" -msgstr "Ventilo impr avant ?" +msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." -msgstr "Chauffe desactivee par le compteur de securite." +msgstr "Chauffage desactivee par le compteur de securite." # MSG_HEATING_COMPLETE c=20 #: messages.c:47 @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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 ?" +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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Change correctement?" @@ -541,14 +541,14 @@ msgid "Checking bed " msgstr "Verification du lit" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" -msgstr "Verifications butees" +msgstr "Verification butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " -msgstr "Verif. tete impr." +msgstr "Verif. du hotend" # MSG_SELFTEST_CHECK_FSENSOR c=20 #: messages.c:82 @@ -556,29 +556,29 @@ msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Verification axe Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 #: messages.c:49 msgid "Choose extruder:" -msgstr "Choisir extrudeur :" +msgstr "Choisir extrudeur:" # MSG_CHOOSE_FILAMENT c=20 r=1 #: messages.c:50 msgid "Choose filament:" -msgstr "Choix du filament :" +msgstr "Choix du filament:" # MSG_FILAMENT c=17 r=1 #: messages.c:30 @@ -586,17 +586,17 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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." +msgstr "Je vais maintenant lancer la calibration XYZ. Cela prendra 12 min environ." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4913 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." -msgstr "Je vais maintenant lancer la calibration z." +msgstr "Je vais maintenant lancer la calibration Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4978 +#: ultralcd.cpp:5064 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" @@ -606,44 +606,44 @@ msgid "Info screen" msgstr "Ecran d'info" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" -msgstr "Le filament 1 est-il charge ?" +msgstr "Fil.1 est-il charge?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" -msgstr "Le filament est-il charge ?" +msgstr "Fil. est-il charge?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" -msgstr "Est-ce du filament PLA ?" +msgstr "Est-ce du filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" -msgstr "Le filament PLA est-il charge ?" +msgstr "Fil. PLA est-il charge?" # MSG_STEEL_SHEET_CHECK c=20 r=2 #: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "Feuille d'acier sur plateau chauffant ?" +msgstr "Plaque d'impression sur le lit chauffant?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" -msgstr "Echecs derniere impr" +msgstr "Echecs derniere imp." # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" -msgstr "Derniere impression" +msgstr "Derniere impres." # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 @@ -651,24 +651,24 @@ msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Correction lin." # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" -msgstr "Ajuster Z en direct" +msgstr "Ajuster Z en dir." # MSG_LOAD_FILAMENT c=17 #: messages.c:51 @@ -676,24 +676,24 @@ msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" -msgstr "Chargement couleur" +msgstr "Charg. de la couleur" # MSG_LOADING_FILAMENT c=20 #: messages.c:52 msgid "Loading filament" -msgstr "Chargement filament" +msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" -msgstr "Charger dans la buse" +msgstr "Charger la buse" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 @@ -703,7 +703,7 @@ msgstr "M117 Cal. 1ere couche" # MSG_MAIN #: messages.c:56 msgid "Main" -msgstr "Principal" +msgstr "Menu principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: messages.c:59 @@ -711,7 +711,7 @@ msgid "Measuring reference height of calibration point" msgstr "Mesure de la hauteur de reference du point de calibration" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "" @@ -723,17 +723,17 @@ msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 #: mmu.cpp:755 msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Remontee en temperature..." +msgstr "MMU OK. Rechauffage de la buse..." # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" -msgstr "Deviation mesuree" +msgstr "Deviat.mesuree" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" -msgstr "Echec MMU" +msgstr "Echecs MMU" # #: mmu.cpp:1613 @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Echecs charg. MMU" @@ -758,7 +758,7 @@ msgstr "" # MSG_SILENT_MODE_ON #: messages.c:89 msgid "Mode [silent]" -msgstr "Mode [silencieux]" +msgstr "Mode [feutre]" # #: mmu.cpp:719 @@ -766,14 +766,14 @@ msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "Echecs alim. MMU" # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mode [Furtif]" +msgstr "Mode [furtif]" # MSG_AUTO_MODE_ON #: messages.c:12 @@ -783,10 +783,10 @@ msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF #: messages.c:88 msgid "Mode [high power]" -msgstr "Mode [haute puiss]" +msgstr "Mode[haute puiss]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU2 connecte" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Pas de carte SD" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "" @@ -836,7 +836,7 @@ msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Non connecte" @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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 la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." @@ -871,37 +871,37 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." -msgstr "Retirez maintenant l'impression de test de la feuille d'acier." +msgstr "Retirez maintenant l'impression de test de la plaque en acier." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Ventilateur buse" +msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pause de l'impr." # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" @@ -911,9 +911,9 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." -msgstr "Nettoyez le plateau chauffant et appuyez sur le bouton." +msgstr "Nettoyez la plaque en acier et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: messages.c:22 @@ -921,34 +921,34 @@ 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:7795 +#: ultralcd.cpp:7881 msgid "Please check :" -msgstr "Verifiez :" +msgstr "Verifiez:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 #: 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." +msgstr "Merci de consulter 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:4808 +#: ultralcd.cpp:4894 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." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Chargez d'abord le filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 #: messages.c:65 msgid "Please place steel sheet on heatbed." -msgstr "Placez la feuille d'acier sur le plateau chauffant." +msgstr "Placez la plaque en acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 #: messages.c:68 @@ -956,9 +956,9 @@ msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." +msgstr "Inserez du PLA dans le 1er tube du MMU, appuyez sur le bouton pour le charger." # MSG_PULL_OUT_FILAMENT c=20 r=4 #: messages.c:70 @@ -973,10 +973,10 @@ msgstr "Veuillez retirer le filament puis appuyez sur le bouton." # MSG_REMOVE_STEEL_SHEET c=20 r=4 #: messages.c:74 msgid "Please remove steel sheet from heatbed." -msgstr "Retirez la feuille d'acier du plateau chauffant." +msgstr "Retirez la plaque en acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." @@ -991,9 +991,9 @@ msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." -msgstr "Veuillez retirer d'abord les protections d'envoi." +msgstr "Retirez d'abord les protections de transport." # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Prechauffage" @@ -1016,54 +1016,54 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" -msgstr "Coupures de courant" +msgstr "Coup.de courant" # MSG_PRINT_ABORTED c=20 #: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" -# -#: ultralcd.cpp:2276 +# c=20 r=1 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "Chauffe pour charger" -# -#: ultralcd.cpp:2280 +# c=20 r=1 +#: ultralcd.cpp:2459 msgid "Preheating to unload" -msgstr "Chauffe pr decharger" +msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventilo impr. :" +msgstr "Vent. impr:" # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" -msgstr "Impr depuis la SD" +msgstr "Impr. depuis la SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Impression en pause" # #: 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." +msgstr "Appuyez sur le bouton pour rechauffer la buse." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 @@ -1071,22 +1071,22 @@ msgid "Printer has not been calibrated yet. Please follow the manual, chapter Fi msgstr "L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" -msgstr "Ventilo impression" +msgstr "Vent. impr" # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recup. impression" @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." -msgstr "Reinit. calibr. XYZ" +msgstr "Reinit. calib. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Reprendre impression" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Droite [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" -msgstr "Port RPi [on]" +msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" -msgstr "Port RPi [off]" +msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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 ?" +msgstr "Lancement de 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Carte SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" -msgstr "Carte SD [flashAir]" +msgstr "CarteSD [flshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Droite" @@ -1161,29 +1161,29 @@ msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du lit" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" -msgstr "Erreur auto-test !" +msgstr "Erreur auto-test!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 @@ -1196,19 +1196,19 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5045 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:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" -msgstr "Selectionnez le filament PLA :" +msgstr "Selectionnez le fil. PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" -msgstr "Regler temp. :" +msgstr "Regler temp.:" # MSG_SETTINGS #: messages.c:86 @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Etat capteur" @@ -1231,22 +1231,22 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Tri : [aucun]" +msgstr "Tri [aucun]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" msgstr "Tri [heure]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Deviation severe" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Deviat.sev.:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "Tri [alphabet]" @@ -1258,35 +1258,35 @@ msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 #: sound.h:6 msgid "Sound [loud]" -msgstr "Son [fort]" +msgstr "Son [fort]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Deviation legere" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Deviat.leg.:" # MSG_SOUND_MUTE c=17 r=1 #: msgid "Sound [mute]" -msgstr "Son [muet]" +msgstr "Son [muet]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Problemes rencontres, nivellement de l'axe Z applique..." +msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." # MSG_SOUND_ONCE c=17 r=1 #: sound.h:7 msgid "Sound [once]" -msgstr "Son [une fois]" +msgstr "Son [une fois]" # MSG_SOUND_SILENT c=17 r=1 #: sound.h:8 msgid "Sound [silent]" -msgstr "Son [silencieux]" +msgstr "Son [feutre]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Vitesse" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Statistiques" @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Echange" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Echec de la calibration en temperature" @@ -1356,52 +1356,52 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be 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:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4 #: messages.c:42 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." +msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Decharger" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "pour decharger fil." @@ -1416,64 +1416,64 @@ msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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." +msgstr "Utilisez Remonter le fil. 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:1511 msgid "Warning: both printer type and motherboard type changed." -msgstr "Attention : Types d'imprimante et de carte mere modifies" +msgstr "Attention: Types d'imprimante et de carte mere modifies" # MSG_CHANGED_MOTHERBOARD c=20 r=4 #: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." -msgstr "Attention : Type de carte mere modifie." +msgstr "Attention: Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 #: Marlin_main.cpp:1507 msgid "Warning: printer type changed." -msgstr "Attention : Type d'imprimante modifie" +msgstr "Attention: Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" -msgstr "Dechargement du filament reussi ?" +msgstr "Dechargement du filament reussi?" # MSG_SELFTEST_WIRINGERROR #: messages.c:85 @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1503,212 +1503,212 @@ msgstr "Oui" # MSG_WIZARD_QUIT c=20 r=8 #: messages.c:103 msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours relancer l'assistant dans Calibration-> Assistant." +msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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 !" +msgstr "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot!" # -#: ultralcd.cpp:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations !" +msgstr "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." -msgstr "Calibration XYZ compromise. Les points de calibration avant ne sont pas atteignables." +msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" -msgstr "Tout charger" +msgstr "Charger un par un" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." +msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" msgstr "Correct-Y:" # MSG_OFF #: menu.cpp:426 msgid " [off]" -msgstr "" +msgstr " [off]" # #: messages.c:57 msgid "Back" -msgstr "" +msgstr "Retour" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" -msgstr "" +msgstr "Verifications" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" -msgstr "" +msgstr "Faux declenchement" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" -msgstr "" +msgstr "FINDA:" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" -msgstr "" +msgstr "Firmware [aucune]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" -msgstr "" +msgstr "Firmware[stricte]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" -msgstr "" +msgstr "Firmware [avert]" # #: messages.c:87 msgid "HW Setup" -msgstr "" +msgstr "Config HW" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" -msgstr "" +msgstr "IR:" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" -msgstr "" +msgstr "Compens. aim.[N/A]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" -msgstr "" +msgstr "Compens. aim.[off]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" -msgstr "" +msgstr "Compens. aim. [on]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" msgstr "" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "Firmware MK3S detecte sur imprimante MK3" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" -msgstr "" +msgstr "Mode MMU [normal]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" -msgstr "" +msgstr "Mode MMU [feutre]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." -msgstr "" +msgstr "Changement de mode en cours..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" -msgstr "" +msgstr "Modele [aucune]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" -msgstr "" +msgstr "Modele [stricte]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" -msgstr "" +msgstr "Modele [avert]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" -msgstr "" +msgstr "Diam. buse [0.25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" -msgstr "" +msgstr "Diam. buse [0.40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" -msgstr "" +msgstr "Diam. buse [0.60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" -msgstr "" +msgstr "Buse [aucune]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" -msgstr "" +msgstr "Buse [stricte]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" -msgstr "" +msgstr "Buse [avert]" # #: util.cpp:510 @@ -1723,85 +1723,95 @@ msgstr "" # #: util.cpp:427 msgid "G-code sliced for a different printer type. Continue?" -msgstr "" +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 "" +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 "" +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 "" +msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" -msgstr "" +msgstr "PINDA:" -# -#: ultralcd.cpp:2286 +# c=20 r=1 +#: ultralcd.cpp:2465 msgid "Preheating to cut" -msgstr "" +msgstr "Chauffe pour couper" -# -#: ultralcd.cpp:2283 +# c=20 r=1 +#: ultralcd.cpp:2462 msgid "Preheating to eject" -msgstr "" +msgstr "Chauf. pour remonter" # #: util.cpp:390 msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "" +msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?" # #: util.cpp:397 msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." -msgstr "" +msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" -msgstr "" +msgstr "Renommer" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" -msgstr "" +msgstr "Selectionner" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" -msgstr "" +msgstr "Info capteur" # #: messages.c:58 msgid "Sheet" -msgstr "" +msgstr "Plaque" # -#: -msgid "Sound [assist]" -msgstr "" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Son [assist]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "" +msgstr "Plaques en acier" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" -msgstr "" +msgstr "Correct-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "" +msgstr "Mesurer x-fois [1]" + +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Mesurer x-fois [3]" + +# +#: ultralcd.cpp:7039 +msgid "Z-probe nr. [5]" +msgstr "Mesurer x-fois [5]" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 852e024abe..00623804ca 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: Wed Sep 4 16:14:05 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:14:05 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:07:29 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:07:29 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,7 +26,7 @@ msgid " of 9" msgstr "su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -37,21 +37,21 @@ msgstr "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" # MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #: -msgid "WARNING:\x0aCrash detection disabled in Stealth mode" +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Annulla" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Nessun errore" @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 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:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 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:2771 +#: ultralcd.cpp:2813 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..." +msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -136,7 +136,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -151,9 +151,9 @@ msgid "Bed" msgstr "Letto" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" -msgstr "Stato delle cinghie" +msgstr "Stato cinghie" # MSG_RECOVER_PRINT c=20 r=2 #: messages.c:71 @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "C'e stato un Blackout. Recuperare la stampa?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Calibrazione completa" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Annulla" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Colore non puro" @@ -226,24 +226,24 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" -msgstr "Rilevam.imp. [on]" +msgstr "Rileva.crash [on]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Rilevam.imp.[N/A]" +msgstr "Rileva.crash[N/A]" # MSG_CRASHDETECT_OFF #: messages.c:26 msgid "Crash det. [off]" -msgstr "Rilevam.imp.[off]" +msgstr "Rileva.crash[off]" # MSG_CRASH_DETECTED c=20 r=1 #: messages.c:24 @@ -256,22 +256,22 @@ msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Disabilita motori" @@ -281,12 +281,12 @@ 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:4984 +#: ultralcd.cpp:5070 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=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Correzione-E:" @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "Espelli filamento " # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "Espellere" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "Espellendo filamento " # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 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:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -336,12 +336,12 @@ msgid "ERROR:" msgstr "ERRORE:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" -msgstr "Ventola estrusore:" +msgstr "Ventola estr:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "Info estrusore" @@ -351,14 +351,14 @@ msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" -msgstr "Statistiche fallimenti MMU" +msgstr "Stat.fall. MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "Autocar.filam[on]" +msgstr "Autocar.fil. [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -366,19 +366,19 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" -msgstr "Statistiche fallimenti" +msgstr "Stat. fallimenti" # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" -msgstr "Velocita ventola" +msgstr "Velocita vent." # MSG_SELFTEST_FAN c=20 #: messages.c:78 @@ -386,32 +386,32 @@ msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" -msgstr "Controllo ventole [on]" +msgstr "Control.vent [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Control.vent[off]" # MSG_FSENSOR_ON #: messages.c:45 msgid "Fil. sensor [on]" -msgstr "Sensor filam.[On]" +msgstr "Sensore fil. [on]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" -msgstr "Sensor filam[N/A]" +msgstr "Sensore fil.[N/A]" # MSG_FSENSOR_OFF #: messages.c:44 msgid "Fil. sensor [off]" -msgstr "Sensor filam[off]" +msgstr "Sensore fil.[off]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. esauriti" @@ -421,7 +421,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. non caricato" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "Sensore filam." # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filamento utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Tempo di stampa" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -453,10 +453,10 @@ msgstr "Finalizzando gli spostamenti" # MSG_V2_CALIBRATION c=17 r=1 #: messages.c:105 msgid "First layer cal." -msgstr "Calibrazione primo layer." +msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 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." @@ -466,12 +466,12 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Cambiato correttamente?" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "Verifica ugello" @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Verifica asse Z" @@ -586,17 +586,17 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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:4913 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4978 +#: ultralcd.cpp:5064 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." @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "Schermata info" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "Il filamento 1 e caricato?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "La piastra d'acciaio e sul piano riscaldato?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "Ultima stampa" @@ -651,19 +651,19 @@ msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" -msgstr "Lato sinistro [um]" +msgstr "Sinistra [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" -msgstr "Correzione lin." +msgstr "Correzione lineare" # MSG_BABYSTEP_Z #: messages.c:13 @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Caricando colore" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "Carica ugello" @@ -711,9 +711,9 @@ msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh livel. letto" +msgstr "Livel. piatto" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 #: mmu.cpp:762 @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" -msgstr "Disassamento misurato" +msgstr "Deviazione mis" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Fallimenti MMU" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" @@ -753,12 +753,12 @@ msgstr "MMU OK. Riprendendo... " # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" -msgstr "Modo [normale]" +msgstr "Mod. [normale]" # MSG_SILENT_MODE_ON #: messages.c:89 msgid "Mode [silent]" -msgstr "Modo [silenzioso]" +msgstr "Mod. [silenziosa]" # #: mmu.cpp:719 @@ -766,27 +766,27 @@ msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" -msgstr "Mancanza corrente MMU" +msgstr "Manc. corr. MMU" # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Modo [Silenziosa]" +msgstr "Mod. [silenziosa]" # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" -msgstr "Modo [auto]" +msgstr "Mod. [auto]" # MSG_SILENT_MODE_OFF #: messages.c:88 msgid "Mode [high power]" -msgstr "Mode [forte]" +msgstr "Mod. [forte]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU2 connessa" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" -msgstr "Muovi X" +msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" -msgstr "Muovi Y" +msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" -msgstr "Muovi Z" +msgstr "Sposta Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Nessuna SD" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "" @@ -836,7 +836,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Non connesso" @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." @@ -868,40 +868,40 @@ msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 #: 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" +msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Metti in pausa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" @@ -911,7 +911,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -921,7 +921,7 @@ 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:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Verifica:" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 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:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." @@ -976,7 +976,7 @@ 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:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Preriscalda" @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "Mancanza corrente" @@ -1031,19 +1031,19 @@ msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "Preriscaldamento per caricare" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" msgstr "Preriscaldamento per scaricare" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventola di stampa:" +msgstr "Vent.stam:" # MSG_CARD_MENU #: messages.c:21 @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "Premere la manopola" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Stampa in pausa" @@ -1071,22 +1071,22 @@ 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:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" msgstr "Ventola di stampa" # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recupero stampa" @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Riprendi stampa" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Destra [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Mem. SD [normale]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Destra" @@ -1161,27 +1161,27 @@ msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Errore Autotest !" @@ -1196,17 +1196,17 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5045 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "Selezionate filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Imposta temperatura:" @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Stato sensore" @@ -1231,24 +1231,24 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting 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:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Ordina [none]" +msgstr "Ordina [nessuno]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" -msgstr "Ordina [time]" +msgstr "Ordina [cron.]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Disassamento grave" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Devia.grave:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" -msgstr "Ordine [alfabet]" +msgstr "Ordine [alfabeti]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -1261,9 +1261,9 @@ msgid "Sound [loud]" msgstr "Suono [forte]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Disassamento lieve" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Devia.lieve:" # MSG_SOUND_MUTE c=17 r=1 #: @@ -1271,7 +1271,7 @@ msgid "Sound [mute]" msgstr "Suono [mute]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." @@ -1286,7 +1286,7 @@ msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Velocita" @@ -1296,12 +1296,12 @@ msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Statistiche" @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Scambiato" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Calib. temp. [ON]" +msgstr "Calib. temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Calib. temp.[OFF]" +msgstr "Calib. temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperature" @@ -1371,44 +1371,44 @@ 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:2863 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" -msgstr "Tempo di stampa totale" +msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Scarica" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" -msgstr "Scarica filam." +msgstr "Scarica filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 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:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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." @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1506,62 +1506,62 @@ 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:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "Caricare tutti" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 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:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" msgstr "Correzione-Y:" @@ -1576,32 +1576,32 @@ msgid "Back" msgstr "Indietro" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" msgstr "Controlli" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "Falso innesco" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" msgstr "" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "Firmware[nessuno]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" msgstr "Firmware [esatto]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" msgstr "Firmware [avviso]" @@ -1611,147 +1611,147 @@ msgid "HW Setup" msgstr "Installazione HW" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" msgstr "Comp. Magneti[N/A]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "Comp. Magneti[off]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "Comp. Magneti [on]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "Griglia [3x3]" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "Griglia [7x7]" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" msgstr "Mesh livel. letto" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "Firmware MK3S rilevato su stampante MK3" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "Modalita MMU [Normale]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" msgstr "Modalita MMU [Silenziosa]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "Cambio modalita in corso ..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "Modello [nessuno]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" msgstr "Modello [esatto]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" msgstr "Modello [avviso]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" -msgstr "Diam. Ugell[0.25]" +msgstr "Diam.Ugello[0.25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" -msgstr "Diam. Ugell[0.40]" +msgstr "Diam.Ugello[0.40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" -msgstr "Diam. Ugell[0.60]" +msgstr "Diam.Ugello[0.60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "Ugello [nessuno]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" msgstr "Ugello [esatto]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" msgstr "Ugello [avviso]" # #: util.cpp:510 msgid "G-code sliced for a different level. Continue?" -msgstr "" +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 "" +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 "" +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 "" +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 "" +msgstr "G-code processato per un firmware piu recente. Continuare?" # #: util.cpp:483 msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "" +msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" msgstr "" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" msgstr "Preriscaldamento per taglio" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" msgstr "Preriscaldamento per espulsione" @@ -1766,17 +1766,17 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "Rinomina" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "Seleziona" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "Info Sensore" @@ -1786,22 +1786,27 @@ msgid "Sheet" msgstr "Piano" # -#: -msgid "Sound [assist]" -msgstr "" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Suono [assist.]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "" +msgstr "Piani d'acciaio" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Correzione-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Z-probe nr. [1]" +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Z-probe nr. [3]" + diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index d5a6794912..133a1b56d6 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: Wed Sep 4 16:14:12 CEST 2019\n" -"PO-Revision-Date: Wed Sep 4 16:14:12 CEST 2019\n" +"POT-Creation-Date: Sun, Sep 22, 2019 2:08:35 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 2:08:35 PM\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -26,9 +26,9 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3027 +#: ultralcd.cpp:3089 msgid "[0;0] point offset" -msgstr "[0;0] przesuniecie punktu" +msgstr "[0;0] przesun.punktu" # MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 #: @@ -41,17 +41,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2290 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Anuluj" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3147 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Dostrajanie Z:" +msgstr "Ustawianie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Wszystko OK " @@ -61,32 +61,32 @@ msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:1974 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2576 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3445 +#: ultralcd.cpp:3529 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_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5114 +#: ultralcd.cpp:5200 msgid "SpoolJoin [on]" msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:5110 +#: ultralcd.cpp:5196 msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [nd]" +msgstr "SpoolJoin [N/D]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5118 +#: ultralcd.cpp:5204 msgid "SpoolJoin [off]" msgstr "SpoolJoin [wyl]" @@ -96,32 +96,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6736 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "AutoLadowanie fil." +msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4378 +#: ultralcd.cpp:4462 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:2771 +#: ultralcd.cpp:2813 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:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:7865 +#: ultralcd.cpp:7951 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -136,9 +136,9 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5682 +#: ultralcd.cpp:5768 msgid "Bed level correct" -msgstr "Korekta poziomowania stolu" +msgstr "Korekta stolu" # MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 #: messages.c:18 @@ -151,7 +151,7 @@ msgid "Bed" msgstr "Stol" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2002 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Stan paskow" @@ -161,12 +161,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:8211 +#: ultralcd.cpp:8297 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5671 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -176,12 +176,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4654 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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." @@ -191,12 +191,12 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3408 +#: ultralcd.cpp:3492 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:813 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Kalibracja OK" @@ -206,17 +206,17 @@ msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Anuluj" # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2676 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -226,7 +226,7 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4503 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" @@ -238,7 +238,7 @@ msgstr "Wykr.zderzen [wl]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Wykr.zderzen[n/d]" +msgstr "Wykr.zderzen[N/D]" # MSG_CRASHDETECT_OFF #: messages.c:26 @@ -256,24 +256,24 @@ msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1853 msgid "Crash" msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5823 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2102 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5568 +#: ultralcd.cpp:5654 msgid "Disable steppers" -msgstr "Wylaczenie silnikow" +msgstr "Wylacz silniki" # MSG_BABYSTEP_Z_NOT_SET c=20 r=12 #: messages.c:14 @@ -281,14 +281,14 @@ 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:4984 +#: ultralcd.cpp:5070 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=10 -#: ultralcd.cpp:5048 +#: ultralcd.cpp:5134 msgid "E-correct:" -msgstr "Korekcja E:" +msgstr "Korekcja-E:" # MSG_EJECT_FILAMENT c=17 r=1 #: messages.c:53 @@ -296,7 +296,7 @@ msgid "Eject filament" msgstr "Wysun filament" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Eject" msgstr "Wysun" @@ -306,27 +306,27 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4391 +#: ultralcd.cpp:4475 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -336,14 +336,14 @@ msgid "ERROR:" msgstr "BLAD:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" -msgstr "Went. ekstrudera:" +msgstr "WentHotend:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2133 +#: ultralcd.cpp:2244 msgid "Extruder info" -msgstr "Informacje o ekstruderze" +msgstr "Ekstruder - info" # MSG_MOVE_E #: messages.c:29 @@ -351,14 +351,14 @@ msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6760 +#: ultralcd.cpp:6846 msgid "Fail stats MMU" msgstr "Bledy MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5082 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "Autolad. fil [wl]" +msgstr "Autolad.fil. [wl]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -366,12 +366,12 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5084 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Statystyki bledow" @@ -386,12 +386,12 @@ msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5577 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -401,7 +401,7 @@ msgid "Fil. sensor [on]" msgstr "Czuj. filam. [wl]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -411,17 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Konc. filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament wychodzi z dyszy a kolor jest czysty?" +msgstr "Filament wychodzi z dyszy, kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2672 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" @@ -431,17 +431,17 @@ msgid "Filament sensor" msgstr "Czujnik filamentu" # MSG_FILAMENT_USED c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2841 +#: ultralcd.cpp:2886 msgid "Print time" msgstr "Czas druku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -456,7 +456,7 @@ msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4896 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." @@ -466,12 +466,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2095 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" msgstr "" @@ -481,22 +481,22 @@ msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3220 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8468 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -511,12 +511,12 @@ msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4875 +#: ultralcd.cpp:4961 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:2096 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" msgstr "" @@ -526,12 +526,12 @@ msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2587 +#: ultralcd.cpp:2629 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2664 +#: ultralcd.cpp:2706 msgid "Changed correctly?" msgstr "Wymiana ok?" @@ -541,12 +541,12 @@ msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 +#: ultralcd.cpp:8286 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 +#: ultralcd.cpp:8292 msgid "Checking hotend " msgstr "Kontrola hotendu" @@ -556,17 +556,17 @@ msgid "Checking sensors " msgstr "Sprawdzanie czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 +#: ultralcd.cpp:8287 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 +#: ultralcd.cpp:8288 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8203 +#: ultralcd.cpp:8289 msgid "Checking Z axis " msgstr "Kontrola osi Z" @@ -586,17 +586,17 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4905 +#: ultralcd.cpp:4991 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:4913 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4978 +#: ultralcd.cpp:5064 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" @@ -606,27 +606,27 @@ msgid "Info screen" msgstr "Ekran informacyjny" # -#: ultralcd.cpp:4938 +#: ultralcd.cpp:5024 msgid "Is filament 1 loaded?" msgstr "Filament 1 zaladowany?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4941 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4972 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4704 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" @@ -636,12 +636,12 @@ msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:1823 +#: ultralcd.cpp:1772 msgid "Last print" msgstr "Ost. wydruk" @@ -651,19 +651,19 @@ msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2970 +#: ultralcd.cpp:3018 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5680 msgid "Lin. correction" -msgstr "Korekcja lin." +msgstr "Korekcja liniowa" # MSG_BABYSTEP_Z #: messages.c:13 @@ -676,7 +676,7 @@ msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2612 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -686,12 +686,12 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6719 +#: ultralcd.cpp:6805 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" @@ -711,7 +711,7 @@ msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5677 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" @@ -726,12 +726,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:3005 +#: ultralcd.cpp:3059 msgid "Measured skew" msgstr "Zmierzony skos" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Bledy MMU" @@ -741,7 +741,7 @@ msgid "MMU load failed " msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1840 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Bledy ladow. MMU" @@ -766,14 +766,14 @@ msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1823 msgid "MMU power fails" msgstr "Zaniki zasil. MMU" # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Tryb [Stealth]" +msgstr "Tryb [cichy]" # MSG_AUTO_MODE_ON #: messages.c:12 @@ -786,7 +786,7 @@ msgid "Mode [high power]" msgstr "Tryb[wysoka wyd.]" # -#: ultralcd.cpp:2108 +#: ultralcd.cpp:2219 msgid "MMU2 connected" msgstr "MMU podlaczone" @@ -796,37 +796,37 @@ msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5566 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4294 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4295 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4296 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5291 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6686 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Brak karty SD" # -#: ultralcd.cpp:2976 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "N/D" @@ -836,7 +836,7 @@ msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Nie podlaczono " @@ -851,12 +851,12 @@ msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:5063 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:4921 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." @@ -871,37 +871,37 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:4912 +#: ultralcd.cpp:4998 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # -#: ultralcd.cpp:1782 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Went. hotendu" +msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6649 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Wstrzymanie wydruku" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1598 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1604 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5683 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:843 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" @@ -911,17 +911,17 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:4986 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: messages.c:22 msgid "Please clean the nozzle for calibration. Click when done." -msgstr "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." +msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Sprawdz :" @@ -931,17 +931,17 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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:4808 +#: ultralcd.cpp:4894 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:4709 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3063 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." @@ -956,7 +956,7 @@ msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # -#: ultralcd.cpp:4803 +#: ultralcd.cpp:4889 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." @@ -976,7 +976,7 @@ 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:4354 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" @@ -991,7 +991,7 @@ msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:4911 +#: ultralcd.cpp:4997 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" @@ -1001,7 +1001,7 @@ msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6636 +#: ultralcd.cpp:6722 msgid "Preheat" msgstr "Grzanie" @@ -1016,12 +1016,12 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10365 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:1876 +#: ultralcd.cpp:1851 msgid "Power failures" msgstr "Zaniki zasilania" @@ -1031,19 +1031,19 @@ msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:2276 +#: ultralcd.cpp:2455 msgid "Preheating to load" msgstr "Nagrzew. do ladowania" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2459 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Went. wydruku:" +msgstr "WentWydruk:" # MSG_CARD_MENU #: messages.c:21 @@ -1051,12 +1051,12 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2206 +#: ultralcd.cpp:2317 msgid "Press the knob" msgstr "Wcisnij pokretlo" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1061 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Druk wstrzymany" @@ -1068,25 +1068,25 @@ msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # 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 "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1723 msgid "Print FAN" -msgstr "Went. wydruku" +msgstr "WentWydruk" # MSG_PRUSA3D -#: ultralcd.cpp:2094 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3221 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9765 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Wznawianie wydruku" @@ -1101,17 +1101,17 @@ msgid "Prusa i3 MK3S OK." msgstr "Prusa i3 MK3S OK" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3222 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6656 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Wznowic wydruk" @@ -1121,37 +1121,37 @@ msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Prawo [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5606 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5604 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4726 +#: ultralcd.cpp:4812 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:5236 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Karta SD [normal]" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5234 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" # -#: ultralcd.cpp:2971 +#: ultralcd.cpp:3019 msgid "Right" msgstr "Prawa" @@ -1161,29 +1161,29 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5613 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " -msgstr "Rozpoczynanie Selftestu" +msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" -msgstr "Blad selftest !" +msgstr "Blad selftest!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 @@ -1196,19 +1196,19 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:4959 +#: ultralcd.cpp:5045 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: ultralcd.cpp:4695 +#: ultralcd.cpp:4780 msgid "Select PLA filament:" msgstr "Wybierz filament PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3230 +#: ultralcd.cpp:3314 msgid "Set temperature:" -msgstr "Ustaw. temperatury:" +msgstr "Ustaw temperature:" # MSG_SETTINGS #: messages.c:86 @@ -1216,12 +1216,12 @@ msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5685 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:3941 +#: ultralcd.cpp:4025 msgid "Sensor state" msgstr "Stan czujnikow" @@ -1231,24 +1231,24 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5246 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Sortuj [brak]" +msgstr "Sortowanie [brak]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5244 +#: ultralcd.cpp:5330 msgid "Sort [time]" -msgstr "Sortuj [czas]" +msgstr "Sortowanie [czas]" # -#: ultralcd.cpp:3008 -msgid "Severe skew" -msgstr "Znaczny skos" +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Znaczny skos:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5245 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" -msgstr "Sortuj [alfabet]" +msgstr "Sortowanie[alfab]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -1258,22 +1258,22 @@ msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 #: sound.h:6 msgid "Sound [loud]" -msgstr "Dzwiek [Glosny]" +msgstr "Dzwiek [glosny]" # -#: ultralcd.cpp:3007 -msgid "Slight skew" -msgstr "Lekki skos" +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Lekki skos:" # MSG_SOUND_MUTE c=17 r=1 #: msgid "Sound [mute]" -msgstr "Dzwiek[Wylaczony]" +msgstr "Dzwiek[wylaczony]" # -#: Marlin_main.cpp:4870 +#: Marlin_main.cpp:4871 msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Wykryto problem, wymuszono poziomowanie osi Z ..." +msgstr "Wykryto problem, wymuszono poziomowanie osi Z." # MSG_SOUND_ONCE c=17 r=1 #: sound.h:7 @@ -1283,10 +1283,10 @@ msgstr "Dzwiek [1-raz]" # MSG_SOUND_SILENT c=17 r=1 #: sound.h:8 msgid "Sound [silent]" -msgstr "Dzwiek [Cichy]" +msgstr "Dzwiek [cichy]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Predkosc" @@ -1296,19 +1296,19 @@ msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4367 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 msgid "Statistics " msgstr "Statystyki" # MSG_STOP_PRINT #: messages.c:93 msgid "Stop print" -msgstr "Zatrzymac druk" +msgstr "Przerwanie druku" # MSG_STOPPED #: messages.c:94 @@ -1316,12 +1316,12 @@ msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Zamieniono" @@ -1331,22 +1331,22 @@ msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5600 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Kalibr. temp.[wl]" +msgstr "Kalibr.temp. [wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5598 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5694 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3867 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" @@ -1356,12 +1356,12 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # MSG_TEMPERATURE -#: ultralcd.cpp:5564 +#: ultralcd.cpp:5650 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2140 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperatury" @@ -1371,37 +1371,37 @@ 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:2863 +#: ultralcd.cpp:2908 msgid "Total filament" -msgstr "Calkowita dlugosc filamentu" +msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2863 +#: ultralcd.cpp:2908 msgid "Total print time" -msgstr "Calkowity czas druku" +msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6633 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:4783 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Rozladuj" # -#: ultralcd.cpp:1857 +#: ultralcd.cpp:1820 msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2213 +#: ultralcd.cpp:2324 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2217 +#: ultralcd.cpp:2328 msgid "to unload filament" msgstr "aby rozlad. filament" @@ -1416,42 +1416,42 @@ msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:1824 +#: ultralcd.cpp:1773 msgid "Total" msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5822 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2143 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2116 +#: ultralcd.cpp:2227 msgid "unknown" msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:5262 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3374 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3338 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" # -#: ultralcd.cpp:4782 +#: ultralcd.cpp:4868 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." @@ -1471,7 +1471,7 @@ msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3053 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" @@ -1481,12 +1481,12 @@ msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5661 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2132 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1506,69 +1506,69 @@ 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:3838 +#: ultralcd.cpp:3922 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:3835 +#: ultralcd.cpp:3919 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:5044 +#: ultralcd.cpp:5130 msgid "X-correct:" -msgstr "Korekcja X:" +msgstr "Korekcja-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3916 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:3816 +#: ultralcd.cpp:3900 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:3819 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6080 +#: ultralcd.cpp:6166 msgid "Load all" msgstr "Zalad. wszystkie" # -#: ultralcd.cpp:3798 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3807 +#: ultralcd.cpp:3891 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:5045 +#: ultralcd.cpp:5131 msgid "Y-correct:" -msgstr "Korekcja Y:" +msgstr "Korekcja-Y:" # MSG_OFF #: menu.cpp:426 msgid " [off]" -msgstr "" +msgstr " [wyl]" # #: messages.c:57 @@ -1576,32 +1576,32 @@ msgid "Back" msgstr "Wstecz" # -#: ultralcd.cpp:5553 +#: ultralcd.cpp:5639 msgid "Checks" msgstr "Testy" # -#: ultralcd.cpp:7887 +#: ultralcd.cpp:7973 msgid "False triggering" msgstr "Falszywy alarm" # -#: ultralcd.cpp:3946 +#: ultralcd.cpp:4030 msgid "FINDA:" msgstr "" # -#: ultralcd.cpp:5459 +#: ultralcd.cpp:5545 msgid "Firmware [none]" msgstr "Firmware [brak]" # -#: ultralcd.cpp:5465 +#: ultralcd.cpp:5551 msgid "Firmware [strict]" msgstr "Firmware [restr.]" # -#: ultralcd.cpp:5462 +#: ultralcd.cpp:5548 msgid "Firmware [warn]" msgstr "Firmware[ostrzez]" @@ -1611,102 +1611,102 @@ msgid "HW Setup" msgstr "Ustawienia HW" # -#: ultralcd.cpp:3950 +#: ultralcd.cpp:4034 msgid "IR:" msgstr "" # -#: ultralcd.cpp:6960 +#: ultralcd.cpp:7046 msgid "Magnets comp.[N/A]" -msgstr "Kor. magnesow [nd]" +msgstr "Kor. magnesow[N/D]" # -#: ultralcd.cpp:6958 +#: ultralcd.cpp:7044 msgid "Magnets comp.[Off]" msgstr "Kor. magnesow[wyl]" # -#: ultralcd.cpp:6957 +#: ultralcd.cpp:7043 msgid "Magnets comp. [On]" msgstr "Kor. magnesow [wl]" # -#: ultralcd.cpp:6949 +#: ultralcd.cpp:7035 msgid "Mesh [3x3]" msgstr "Siatka [3x3]" # -#: ultralcd.cpp:6950 +#: ultralcd.cpp:7036 msgid "Mesh [7x7]" msgstr "Siatka [7x7]" # -#: ultralcd.cpp:5591 +#: ultralcd.cpp:5677 msgid "Mesh bed leveling" -msgstr "Poziomowanie wg siatki" +msgstr "Poziomowanie stolu" # #: Marlin_main.cpp:856 msgid "MK3S firmware detected on MK3 printer" -msgstr "" +msgstr "Wykryto firmware MK3S w drukarce MK3" # -#: ultralcd.cpp:5220 +#: ultralcd.cpp:5306 msgid "MMU Mode [Normal]" msgstr "Tryb MMU[Normaln]" # -#: ultralcd.cpp:5221 +#: ultralcd.cpp:5307 msgid "MMU Mode[Stealth]" -msgstr "Tryb MMU [Stealth]" +msgstr "Tryb MMU[Stealth]" # -#: ultralcd.cpp:4427 +#: ultralcd.cpp:4511 msgid "Mode change in progress ..." msgstr "Trwa zmiana trybu..." # -#: ultralcd.cpp:5420 +#: ultralcd.cpp:5506 msgid "Model [none]" msgstr "Model [brak]" # -#: ultralcd.cpp:5426 +#: ultralcd.cpp:5512 msgid "Model [strict]" msgstr "Model [restrykc.]" # -#: ultralcd.cpp:5423 +#: ultralcd.cpp:5509 msgid "Model [warn]" msgstr "Model [ostrzez.]" # -#: ultralcd.cpp:5381 +#: ultralcd.cpp:5467 msgid "Nozzle d. [0.25]" msgstr "Sr. dyszy [0,25]" # -#: ultralcd.cpp:5384 +#: ultralcd.cpp:5470 msgid "Nozzle d. [0.40]" msgstr "Sr. dyszy [0,40]" # -#: ultralcd.cpp:5387 +#: ultralcd.cpp:5473 msgid "Nozzle d. [0.60]" msgstr "Sr. dyszy [0,60]" # -#: ultralcd.cpp:5335 +#: ultralcd.cpp:5421 msgid "Nozzle [none]" msgstr "Dysza [brak]" # -#: ultralcd.cpp:5341 +#: ultralcd.cpp:5427 msgid "Nozzle [strict]" msgstr "Dysza [restrykc.]" # -#: ultralcd.cpp:5338 +#: ultralcd.cpp:5424 msgid "Nozzle [warn]" msgstr "Dysza [ostrzez.]" @@ -1718,40 +1718,40 @@ msgstr "" # #: util.cpp:516 msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -msgstr "" +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 "" +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 "" +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 "" +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 "" +msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." # -#: ultralcd.cpp:3942 +#: ultralcd.cpp:4026 msgid "PINDA:" msgstr "" # -#: ultralcd.cpp:2286 +#: ultralcd.cpp:2465 msgid "Preheating to cut" msgstr "Nagrzewanie do obciecia" # -#: ultralcd.cpp:2283 +#: ultralcd.cpp:2462 msgid "Preheating to eject" msgstr "Nagrzewanie do wysuniecia" @@ -1766,17 +1766,17 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." # -#: ultralcd.cpp:6597 +#: ultralcd.cpp:6683 msgid "Rename" msgstr "Zmien nazwe" # -#: ultralcd.cpp:6593 +#: ultralcd.cpp:6679 msgid "Select" msgstr "Wybierz" # -#: ultralcd.cpp:2134 +#: ultralcd.cpp:2245 msgid "Sensor info" msgstr "Info o sensorach" @@ -1786,22 +1786,27 @@ msgid "Sheet" msgstr "Plyta" # -#: -msgid "Sound [assist]" -msgstr "" +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Dzwiek [asyst.]" # -#: ultralcd.cpp:5551 +#: ultralcd.cpp:5637 msgid "Steel sheets" -msgstr "" +msgstr "Plyty stalowe" # -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Korekcja-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "Pomiar-Z [1]" +msgstr "Ilosc Pomiarow [1]" + +# +#: ultralcd.cpp:7040 +msgid "Z-probe nr. [3]" +msgstr "Ilosc Pomiarow [3]" diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index 79a932ba97..6ba6bb256b 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into Czech. +# msgid "" msgstr "" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:28:20 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:28:20 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -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;0Htichem modu" - -# -#: ultralcd.cpp:3913 -msgid " 1" -msgstr "1" - -# MSG_PLANNER_BUFFER_BYTES -#: Marlin_main.cpp:1184 -msgid " PlannerBufferBytes: " -msgstr " PlannerBufferBytes: " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr "[vyp" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr "zabraneno extruzi za studena" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr "Volna pamet: " - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr "Naposledy aktualizovano:" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,48 +25,33 @@ msgstr " z 4" msgid " of 9" msgstr " z 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr "[vyp]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Fact" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "[0;0] odsazeni bodu" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash detekce muze\x0abyt zapnuta pouze v\x0aNormal modu" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Zrusit" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Doladeni Z" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" msgstr "Doladeni Z:" -# MSG_ALL c=19 r=1 -#: messages.c:11 -msgid "All" -msgstr "Vse" - # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Vse OK " @@ -108,92 +61,67 @@ msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Okoli" # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Auto doladit Z ?" - # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "Spoj Civky [zap]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "SpoolJoin [zap]" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "Spoj Civky [N/A]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "Spoj Civky [vyp]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "SpoolJoin [vyp]" # MSG_AUTO_HOME #: messages.c:11 msgid "Auto home" -msgstr "Auto home" +msgstr "" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 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:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Osa" - # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Delka osy" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Babystepping X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -msgid "Babystepping Y" -msgstr "Babystepping Y" - -# -#: messages.c:57 -msgid "Back" -msgstr "Zpet" - -# MSG_BED -#: messages.c:15 -msgid "Bed" -msgstr "Podlozka" +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -205,10 +133,10 @@ msgstr "Bed OK." # MSG_BED_HEATING #: messages.c:17 msgid "Bed Heating" -msgstr "Zahrivani bed" +msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Korekce podlozky" @@ -217,23 +145,13 @@ 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_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Pocatek seznamu souboru" +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Podlozka" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Stav remenu" @@ -242,18 +160,13 @@ msgstr "Stav remenu" msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4566 -msgid "Calibrate" -msgstr "Zkalibrovat" - -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Kalibrovat E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -262,13 +175,13 @@ msgstr "Kalibrace XYZ" msgid "Calibrate Z" msgstr "Kalibrovat Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Kalibruji vychozi poz." +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." @@ -278,132 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:816 +msgid "Calibration done" +msgstr "Kalibrace OK" + # MSG_MENU_CALIBRATION #: messages.c:61 msgid "Calibration" msgstr "Kalibrace" -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 -msgid "Calibration done" -msgstr "Kalibrace OK" - # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Zrusit" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Nelze otevrit slozku:" - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "Nelze otevrit slozku" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta vlozena" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Karta vyjmuta" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmenit extruder" - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Vymenit filament" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Vymenit SD" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Zmena uspesna!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Vymena ok?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Vymena filamentu!" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Kontrola podlozky" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Kontrola endstopu" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Kontrola hotend " - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Kontrola senzoru" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Kontrola osy X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Kontrola osy Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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: " -msgstr "neplatny kontrolni soucet, posl. radek:\n" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Vyberte extruder:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Vyber filament:" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Barva neni cista" @@ -413,20 +226,10 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Kopirovat vybrany jazyk do XFLASH?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Naraz" - # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" @@ -435,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 @@ -448,27 +251,27 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Vypnout motory" @@ -478,162 +281,82 @@ 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:4968 +#: ultralcd.cpp:5070 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_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "E kalibrace ukoncena. Prosim ocistete trysku. Pote potvrdte tlacitkem." - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekce E" - # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Korekce E:" -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Vysunout" - # MSG_EJECT_FILAMENT c=17 r=1 #: 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:4869 +msgid "Eject" +msgstr "Vysunout" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Vysouvam filament" -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Konec sezn. souboru" +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +#: ultralcd.cpp:7917 +msgid "Endstop not hit" +msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Koncovy spinac" -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 -msgid "Endstop not hit" -msgstr "Kon. spinac nesepnut" - # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Konc. spinace" -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "konc. spinace aktivovany: " - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Cestina" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "zarazovani \"" - # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "chyba zapisu do souboru" +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "CHYBA:" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4388 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8304 +msgid "Extruder fan:" +msgstr "Levy vent.:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Externi SPI flash W25X20CL neodpovida." +# MSG_INFO_EXTRUDER c=15 r=1 +#: ultralcd.cpp:2244 +msgid "Extruder info" +msgstr "" # MSG_MOVE_E #: messages.c:29 msgid "Extruder" -msgstr "Extruder" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extruder 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extruder 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extruder 3" +msgstr "" # -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extruder 4" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 -msgid "Extruder fan:" -msgstr "Levy vent.:" - -# MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 -msgid "Extruder info" -msgstr "Extruder info" +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "Selhani MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "F. autozav. [zap]" @@ -643,25 +366,15 @@ msgid "F. autoload [N/A]" msgstr "F. autozav. [N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "F. autozav. [vyp]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Selhani" -# -#: 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" @@ -673,12 +386,12 @@ msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Kontr. vent.[zap]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Kontr. vent.[vyp]" @@ -687,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:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Fil. senzor [N/A]" @@ -703,22 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Fil. senzor [vyp]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Vypadky filam." -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filament" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Filament nezaveden" @@ -727,68 +430,33 @@ msgstr "Filament nezaveden" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Spotrebovano filamentu" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Filament : " +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Cas tisku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "Soubor otevren:" - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -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 #: messages.c:105 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." @@ -798,14 +466,14 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 @@ -813,47 +481,22 @@ msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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:7801 +#: ultralcd.cpp:7887 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" -# MSG_HEATING -#: messages.c:46 -msgid "Heating" -msgstr "Zahrivani" - # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -862,98 +505,128 @@ msgstr "Zahrivani preruseno bezpecnostnim casovacem." msgid "Heating done." msgstr "Zahrivani OK." +# MSG_HEATING +#: messages.c:46 +msgid "Heating" +msgstr "Zahrivani" + # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "HW nastaveni" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Vymenit filament" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Zmena uspesna!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Vymena ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Kontrola podlozky" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Kontrola endstopu" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Kontrola hotend " + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Kontrola senzoru" + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Kontrola osy X" + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Kontrola osy Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Kontrola osy Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Vyberte extruder:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Vyber filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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:4897 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4962 +#: ultralcd.cpp:5064 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:99 msgid "Info screen" msgstr "Informace" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Inic. SD" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "Je filament 1 zaveden?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Vlozte filament" -# 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: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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Je to PLA filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Je PLA filament zaveden?" @@ -962,48 +635,33 @@ msgstr "Je PLA filament zaveden?" 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 " - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "ZRUSENO." - -# -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Posledni tisk" - # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Vlevo:" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Posledni tisk" # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Vlevo" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Vlevo [um]" -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Vlevo:" - # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Korekce lin." @@ -1012,48 +670,13 @@ msgstr "Korekce lin." msgid "Live adjust Z" msgstr "Doladeni osy Z" -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Zavest vse" - # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Zavest filament" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zavest filament 1" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zavest filament 2" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zavest filament 3" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zavest filament 4" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Zavest filament 5" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "Zavest do trysky" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Cisteni barvy" @@ -1063,175 +686,70 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Uvolnena remenicka" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 Neplatny extruder " - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 Neplatny extruder " - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 Neplatny extruder " +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "Zavest do trysky" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 Neplatny extruder " - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 Neplatny extruder " - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" msgstr "Hlavni nabidka" -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -msgid "Mark filament 100mm from extruder body. Click when done." -msgstr "Oznacte filament 100 mm od tela extruderu a pote potvrdte tlacitkem." - -# -#: ultralcd.cpp:3002 -msgid "Measured skew" -msgstr "Merene zkoseni" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Merene zkos.:" - # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh Bed Leveling" +msgstr "" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Mesh Bed Leveling" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Pokracuji v tisku..." -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "MK3 firmware detekovan na tiskarne MK3S" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Pokracuji v nahrivani..." # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "MK3S firmware detekovan na tiskarne MK3" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Merene zkoseni" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Selhani MMU" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "MMU selhani zavadeni" -# -#: 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." - -# 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 potrebuje zasah uzivatele. Opravte chybu a pote stisknete tlacitko na jednotce MMU." - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: 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:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Pokracuji v nahrivani..." - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "MMU vypadky proudu" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU2 pripojeno" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" @@ -1242,15 +760,20 @@ msgstr "Mod [Normal]" msgid "Mode [silent]" msgstr "Mod [tichy]" +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "MMU potrebuje zasah uzivatele." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "MMU vypadky proudu" + # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mod [Tichy]" - -# -#: ultralcd.cpp:4424 -msgid "Mode change in progress ..." -msgstr "Probiha zmena modu..." +msgstr "Mod [tichy]" # MSG_AUTO_MODE_ON #: messages.c:12 @@ -1263,89 +786,64 @@ 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]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU2 pripojeno" # MSG_SELFTEST_MOTOR #: messages.c:83 msgid "Motor" -msgstr "Motor" +msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Posunout Z" -# -#: ultralcd.cpp:2973 -msgid "N/A" -msgstr "N/A" +# MSG_NO_MOVE +#: Marlin_main.cpp:5292 +msgid "No move." +msgstr "Bez pohybu." + +# MSG_NO_CARD +#: ultralcd.cpp:6772 +msgid "No SD card" +msgstr "Zadna SD karta" # -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Vysla nova verze firmware:" +#: ultralcd.cpp:3024 +msgid "N/A" +msgstr "" # MSG_NO #: messages.c:62 msgid "No" msgstr "Ne" +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:7889 +msgid "Not connected" +msgstr "Nezapojeno " + # -#: -msgid "No " -msgstr "Ne" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Zadny kontrolni soucet s cislem radku, Posl. radek:" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5254 -msgid "No move." -msgstr "Bez pohybu." - -# MSG_NO_CARD -#: ultralcd.cpp:6694 -msgid "No SD card" -msgstr "Zadna SD karta" - -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "Bez termistoru - bez odectu teploty" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 -msgid "Not connected" -msgstr "Nezapojeno " +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Vysla nova verze firmware:" # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 @@ -1353,152 +851,67 @@ msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." -# -#: ultralcd.cpp:4896 -msgid "Now remove the test print from steel sheet." -msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." - # MSG_NOZZLE #: messages.c:63 msgid "Nozzle" msgstr "Tryska" -# -#: 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." - -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Trysk. vent:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Tryska2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Tryska3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1535 +#: 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." -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "otevrit" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "nelze otevrit, Soubor: " +# +#: ultralcd.cpp:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "openRoot selhal" +# +#: ultralcd.cpp:1722 +msgid "Nozzle FAN" +msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pozastavit tisk" -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Vyberte vytisk" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Nahrivani PINDA" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA:" - # MSG_PAPER c=20 r=8 #: 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:7795 -msgid "Please check :" -msgstr "Zkontrolujte :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: 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:4970 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -1507,28 +920,28 @@ msgstr "Prosim ocistete podlozku a stisknete tlacitko." 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:7881 +msgid "Please check :" +msgstr "Zkontrolujte :" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: 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:4804 +#: ultralcd.cpp:4894 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: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." - -# 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 "Prosim zavedte PLA filament a po te obnovte Pruvodce stisknutim reset tlacitka." - # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4706 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Nejdrive prosim zavedte PLA filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." @@ -1542,110 +955,75 @@ msgstr "Umistete prosim tiskovy plat na podlozku" msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete prosim tlacitko" +# +#: ultralcd.cpp:4889 +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:70 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Prosim vyjmete filament a pote stisknete tlacitko." -# -#: 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: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:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prosim aktualizujte." - # MSG_PLEASE_WAIT c=20 #: messages.c:66 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Vypadky proudu" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Zapnuti" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Predehrev" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Predehrev" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Prosim cekejte." # -#: 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 "Predehrev k zavedeni" - -# -#: ultralcd.cpp:2284 -msgid "Preheating to unload" -msgstr "Predehrev k vyjmuti" - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Pripravte filament" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "Stisknete hl. tlacitko" - -# -#: mmu.cpp:723 -msgid "Press the knob to resume nozzle temperature." -msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Vypadky proudu" # MSG_PRINT_ABORTED c=20 #: messages.c:69 @@ -1653,17 +1031,17 @@ msgid "Print aborted" msgstr "Tisk prerusen" # -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Tiskovy vent." +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Predehrev k zavedeni" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Tisk. vent:" +# +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1672,40 +1050,20 @@ msgstr "Tiskovy vent.:" msgid "Print from SD" msgstr "Tisk z SD" +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "Stisknete hl. tlacitko" + # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Tisk pozastaven" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Cas tisku" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Cas tisku: " - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Tiskarna zastavena. Volano kill()!" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 @@ -1713,112 +1071,47 @@ 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." # -#: 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)" -msgstr "Tisk zastaven kvuli chybam. Opravte chybu a pouzijte M999 pro restart. (Teplota resetovana, nastavte ji po restartu)" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 ok." - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 ok." - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK." +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "Tiskovy vent." # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" -msgstr "prusa3d.com" +msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Vzadu [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Obnovovani tisku " -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Obnovit" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Report stavu konc. spinacu" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Poslat znovu" - -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Poslat znovu: " - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 -msgid "Reset" -msgstr "Reset" +#: +msgid "Prusa i3 MK3S OK." +msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." +# MSG_BED_CORRECTION_RESET +#: ultralcd.cpp:3296 +msgid "Reset" +msgstr "" + # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Pokracovat" @@ -1827,113 +1120,68 @@ msgstr "Pokracovat" msgid "Resuming print" msgstr "Obnoveni tisku" -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Vpravo" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Vpravo [um]" -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Pravy:" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -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:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "RPi port [zap]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "RPi port [vyp]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" -msgstr "SD card [normal]" - -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "SD karta ok" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "SD card [FlshAir]" +msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "SD card [FlshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "Selhala inicializace SD" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "SD printing byte " +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Vpravo" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" -# -#: ultralcd.cpp:6601 -msgid "Select" -msgstr "Vybrat" - # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Vyber jazyka" -# -#: ultralcd.cpp:4943 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." - -# -#: ultralcd.cpp:4692 -msgid "Select PLA filament:" -msgstr "Vyberte PLA filament:" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" -msgstr "Self test OK" +msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Chyba Selftestu!" @@ -1943,27 +1191,22 @@ msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: 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:2138 -msgid "Sensor info" -msgstr "Senzor info" - -# -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Stav senzoru" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # -#: -msgid "Sensors info" -msgstr "Senzor info" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "Vyberte PLA filament:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1972,111 +1215,41 @@ msgstr "Nastavte teplotu:" msgid "Settings" msgstr "Nastaveni" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -msgstr "Tezke zkoseni" - -# MSG_SEVERE_SKEW c=15 r=1 -#: ultralcd.cpp:2346 -msgid "Severe skew:" -msgstr "Tezke zkoseni:" - -# -#: messages.c:58 -msgid "Sheet" -msgstr "Plech" - # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Stav konc. spin." # -#: -msgid "Show pinda state" -msgstr "Zobrazit stav PINDA" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "Spankovy rezim..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Lehke zkoseni" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Lehke zkoseni:" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=4 #: 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: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 +#: ultralcd.cpp:5332 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]" -msgstr "Trideni [Zadne]" - -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" msgstr "Trideni [Zadne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Trideni [Cas]\n" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Trideni: [cas]" +#: ultralcd.cpp:5330 +msgid "Sort [time]" +msgstr "Trideni [cas]" -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Trideni [Abeceda]" +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Tezke zkoseni:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" +#: ultralcd.cpp:5331 +msgid "Sort [alphabet]" msgstr "Trideni [Abeceda]" -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Trideni [Zadne]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Trideni [Cas]\n" - # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 msgid "Sorting files" @@ -2087,28 +1260,33 @@ msgstr "Trideni souboru" msgid "Sound [loud]" msgstr "Zvuk [hlasity]" +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Lehke zkoseni:" + # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" msgstr "Zvuk [vypnuto]" +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Vyskytl se problem, srovnavam osu Z ..." + # MSG_SOUND_ONCE c=17 r=1 #: sound.h:7 msgid "Sound [once]" msgstr "Zvuk [jednou]" -# -#: -msgid "Sound [assist]" -msgstr "Zvuk [Asist.]" - # MSG_SOUND_SILENT c=17 r=1 #: sound.h:8 msgid "Sound [silent]" msgstr "Zvuk [tichy]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Rychlost" @@ -2117,41 +1295,16 @@ msgstr "Rychlost" msgid "Spinning" msgstr "Toci se" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [zap]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [vyp]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2163,12 +1316,12 @@ msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Prohozene" @@ -2178,42 +1331,37 @@ msgid "Temp. cal. " msgstr "Tepl. kal. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" msgstr "Tepl. kal. [zap]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Tepl. kal. [vyp]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Teplot. kalibrace" -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Teplota" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -msgid "Temperature calibration has not been run yet" -msgstr "Tiskarna nebyla teplotne zkalibrovana" - # MSG_TEMP_CALIBRATION_DONE c=20 r=12 #: 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:5650 +msgid "Temperature" +msgstr "Teplota" + # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Teploty" @@ -2223,162 +1371,107 @@ 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:2217 -msgid "to load filament" -msgstr "k zavedeni filamentu" - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "k vyjmuti filamentu" - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Celkem" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Celkem selhani" - -# -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filament celkem" -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Filament celkem :" - # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Celkovy cas tisku" -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Celkovy cas :" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "AKTIVNI" - # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Ladit" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "neznamy" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Vysunout" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Vyjmout vse" +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Celkem selhani" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "k zavedeni filamentu" + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "k vyjmuti filamentu" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Vyjmout filament" -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Vyjmout filam. 1" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Vyjmout filam. 2" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Vyjmout filam. 3" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Vyjmout filam. 4" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: 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." +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Napeti" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "volume.init selhalo" +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3335 +#: ultralcd.cpp:3422 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" +# +#: ultralcd.cpp:4868 +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:1527 +#: 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:1519 +#: 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:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" @@ -2388,146 +1481,332 @@ msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Pruvodce" -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "Nelze otevrit workDir" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Zapis do souboru:" - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekce X" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "Korekce X" - # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Ano" + +# MSG_WIZARD_QUIT c=20 r=8 +#: 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:3835 +#: ultralcd.cpp:3922 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:3832 +#: ultralcd.cpp:3919 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:5130 +msgid "X-correct:" +msgstr "Korekce X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 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_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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Zavest vse" + # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3801 +#: ultralcd.cpp:3888 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_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." - -# -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3891 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:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" - # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Y vzdalenost od min" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Y vzdalenost od min:" +# +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Korekce Y:" + +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [vyp]" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekce Y" +#: messages.c:57 +msgid "Back" +msgstr "Zpet" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Korekce Y:" +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Kontrola" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Ano" +# +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Falesne spusteni" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Pouzivate alpha verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." +# +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "" -# 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 "Pouzivate beta verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware [Zadne]" -# MSG_WIZARD_QUIT c=20 r=8 -#: 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:5551 +msgid "Firmware [strict]" +msgstr "Firmware [Prisne]" + +# +#: ultralcd.cpp:5548 +msgid "Firmware [warn]" +msgstr "Firmware[Varovat]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW nastaveni" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "" # -#: ultralcd.cpp:5030 +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Komp. magnetu[N/A]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Komp. magnetu[Vyp]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Komp. magnetu[Zap]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "Mesh [3x3]" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "Mesh [7x7]" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "Mesh Bed Leveling" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detekovan na tiskarne MK3" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "MMU mod [Normal]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod [Tichy]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Model [Zadne]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Model [Prisne]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Model [Varovat]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Tryska [0.25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Tryska [0.40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Tryska [0.60]" + +# +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Tryska [Zadne]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Tryska [Prisne]" + +# +#: ultralcd.cpp:5424 +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 "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." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Predehrev k ustrizeni" + +# +#: ultralcd.cpp:2462 +msgid "Preheating to eject" +msgstr "Predehrev 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:6683 +msgid "Rename" +msgstr "Prejmenovat" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Vybrat" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Senzor info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plat" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Zvuk [Asist.]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Tiskove platy" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Korekce Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Pocet mereni Z [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" msgstr "Pocet mereni Z [3]" -# MSG_MEASURED_OFFSET -#: 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 110aea5eb8..1abf21e2d2 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into German. +# msgid "" msgstr "" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -msgstr "\e[2JCrash Erkennung kann\e[1;0Hnur im Modus Normal\e[2;0Hgenutzt werden" - -# 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[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: " -msgstr " PlannerPufferBytes: " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr " [aus" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr " stopp, Extruder kalt!" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr " Freier Speicher: " - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr " Letztes Update: " +"Language: de\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:29:42 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:29:42 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,50 +25,35 @@ msgstr " von 4" msgid " of 9" msgstr " von 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr "[aus]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Faktor" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "[0;0] Punktversatz" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Crash Erkennung kann\x0anur im Modus Normal\x0agenutzt werden" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Abbruch" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Z wurde eingestellt" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 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:8209 +#: ultralcd.cpp:8295 msgid "All correct " -msgstr "Alles richtig " +msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 #: messages.c:101 @@ -108,39 +61,34 @@ msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Raumtemp." # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Auto Z einstellen?" - # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "Restemodus [an]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "SpoolJoin [an]" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "Restemodus[N/V]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "SpoolJoin [N/V]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "Restemodus [aus]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "SpoolJoin [aus]" # MSG_AUTO_HOME #: messages.c:11 @@ -148,52 +96,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "Auto-Laden Filament" +msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 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:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Achse" - # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Achsenlaenge" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Babystepping X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -msgid "Babystepping Y" -msgstr "Babystepping Y" - -# -#: messages.c:57 -msgid "Back" -msgstr "Zurueck" - -# MSG_BED -#: messages.c:15 -msgid "Bed" -msgstr "Bett" +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -208,7 +136,7 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Ausgleich Bett ok" @@ -217,23 +145,13 @@ 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_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Beginn Dateiliste" +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Bett" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Gurtstatus" @@ -242,18 +160,13 @@ msgstr "Gurtstatus" msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4566 -msgid "Calibrate" -msgstr "Kalibrieren" - -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Kalibrierung E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -262,13 +175,13 @@ msgstr "Kalibrierung XYZ" msgid "Calibrate Z" msgstr "Kalibrierung Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Kalibriere Start" +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." @@ -278,132 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:816 +msgid "Calibration done" +msgstr "Kalibrierung OK" + # MSG_MENU_CALIBRATION #: messages.c:61 msgid "Calibration" msgstr "Kalibrierung" -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 -msgid "Calibration done" -msgstr "Kalibrierung OK" - # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Abbruch" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Kann Unterverzeichnis nicht oeffnen: " - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "Kann Unterverz. nicht oeffnen" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD Karte eingesetzt" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "SD Karte entfernt" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Wechsel Extruder" - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Filament-Wechsel" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Wechsel SD Karte" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Wechsel erfolgr.!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Wechsel ok?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Filament-Wechsel!" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Pruefe Bett " - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Pruefe Endschalter" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Pruefe Duese " - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Pruefe Sensoren " - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Pruefe X Achse " - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Pruefe Y Achse " - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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: " -msgstr "Pruefsummenfehler, Letzte Zeile: " - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Extruder waehlen:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Waehle Filament:" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Falsche Farbe" @@ -413,20 +226,10 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Gewaehlte Sprache vom Xflash kopieren?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Crash" - # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" @@ -448,27 +251,27 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Motoren aus" @@ -478,162 +281,82 @@ 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:4968 +#: ultralcd.cpp:5070 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_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "E-Kalibrierung beendet. Bitte reinigen Sie die Duese. Klicken wenn fertig." - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-Korrektur" - # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "E-Korrektur:" -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Auswurf" - # MSG_EJECT_FILAMENT c=17 r=1 #: 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:4869 +msgid "Eject" +msgstr "Auswurf" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "werfe Filament aus" -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Ende Dateiliste" +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +#: ultralcd.cpp:7917 +msgid "Endstop not hit" +msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Endanschlag" -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 -msgid "Endstop not hit" -msgstr "Ende nicht getroffen" - # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Endschalter" -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "Endanschlag erreicht: " - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Deutsch" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "In Warteschlange \"" - # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "Fehler beim Schreiben in Datei" +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "FEHLER:" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4388 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." - -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Der externe SPI Flash W25X20CL antwortet nicht." - -# MSG_MOVE_E -#: messages.c:29 -msgid "Extruder" -msgstr "Extruder" - -# -#: ultralcd.cpp:5633 -msgid "Extruder 1" -msgstr "Extruder 1" - -# -#: ultralcd.cpp:5634 -msgid "Extruder 2" -msgstr "Extruder 2" - -# -#: ultralcd.cpp:5635 -msgid "Extruder 3" -msgstr "Extruder 3" - -# -#: ultralcd.cpp:5636 -msgid "Extruder 4" -msgstr "Extruder 4" - # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8218 +#: ultralcd.cpp:8304 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2244 msgid "Extruder info" msgstr "Extruder Info" +# MSG_MOVE_E +#: messages.c:29 +msgid "Extruder" +msgstr "" + +# +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "MMU-Fehler" + # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "F.Autoladen [an]" @@ -643,25 +366,15 @@ msgid "F. autoload [N/A]" msgstr "F. Autoload [nv]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "F. Autoload [aus]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Fehlerstatistik" -# -#: 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" @@ -673,12 +386,12 @@ msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Luefter Chk. [an]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Luefter Chk.[aus]" @@ -687,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:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Fil. Sensor [nv]" @@ -703,22 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Fil. Sensor [aus]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. Maengel" -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filament" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament extrudiert + richtige Farbe?" +msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. nicht geladen" @@ -727,68 +430,33 @@ msgstr "Fil. nicht geladen" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filament benutzt" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Filamentverbrauch: " +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Druckzeit" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "Datei geoeffnet: " - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -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 #: messages.c:105 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 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." @@ -798,14 +466,14 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 @@ -813,57 +481,22 @@ msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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:7801 -msgid "Heater/Thermistor" -msgstr "Heizung/Thermistor" - -# MSG_HEATING -#: messages.c:46 -msgid "Heating" -msgstr "Aufwaermen" +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:7887 +msgid "Heater/Thermistor" +msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -872,98 +505,128 @@ msgstr "Heizung durch Sicherheitstimer deaktiviert." msgid "Heating done." msgstr "Aufwaermen OK." +# MSG_HEATING +#: messages.c:46 +msgid "Heating" +msgstr "Aufwaermen" + # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "HW Einstellungen" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Filament-Wechsel" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Wechsel erfolgr.!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Wechsel ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Pruefe Bett " + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Pruefe Endschalter" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Pruefe Duese " + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Pruefe Sensoren " + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Pruefe X Achse " + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Pruefe Y Achse " + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Pruefe Z Achse " + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Extruder waehlen:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Waehle Filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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:4897 +#: ultralcd.cpp:4999 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:4962 +#: ultralcd.cpp:5064 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:99 msgid "Info screen" msgstr "Infoanzeige" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Init. SD Karte" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "Wurde Filament 1 geladen?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Filament einlegen" -# 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: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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Ist es wirklich PLA Filament?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Ist PLA Filament geladen?" @@ -972,48 +635,33 @@ msgstr "Ist PLA Filament geladen?" 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 "Iteration " - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "ABGEBROCHEN. " - -# -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Letzter Druck" - # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Links" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Letzter Druck" # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Linker Luefter?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Links" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Links [um]" -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Links:" - # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -1022,48 +670,13 @@ msgstr "Lineare Korrektur" msgid "Live adjust Z" msgstr "Z einstellen" -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Alle laden" - # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Filament laden" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Filament 1 laden" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Filament 2 laden" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Filament 3 laden" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Filament 4 laden" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Filament 5 laden" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "In Druckduese laden" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Lade Farbe" @@ -1073,175 +686,70 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Lose Riemenscheibe" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 Falscher Extruder " - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 Falscher Extruder " - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 Falscher Extruder " +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "In Druckduese laden" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 Falscher Extruder " - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 Falscher Extruder " - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" msgstr "Hauptmenue" -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -msgid "Mark filament 100mm from extruder body. Click when done." -msgstr "Filament 100mm vom Extrudergehaeuse markieren. Klicken wenn Fertig." - -# -#: ultralcd.cpp:3002 -msgid "Measured skew" -msgstr "Schraeglauf" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Schraeglauf:" - # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh Bett Ausgleich" +msgstr "MeshBett Ausgleich" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Mesh Bett Ausgleich" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Position wiederherstellen..." -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "MK3-Firmware auf MK3S-Drucker erkannt" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Temperatur wiederherstellen..." # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "MK3S-Firmware auf MK3-Drucker erkannt" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Schraeglauf" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "MMU Fehler" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "MMU Ladefehler" -# -#: 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 Stoerung. Beseitigen Sie das Problem und druecken Sie den Knopf an der MMU." - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:762 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Position wiederherstellen... " - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Temperatur wiederherstellen..." - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "MMU Netzfehler" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU2 verbunden" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" @@ -1252,16 +760,21 @@ msgstr "Modus [Normal]" msgid "Mode [silent]" msgstr "Modus [leise]" +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "MMU erfordert Benutzereingriff." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "MMU Netzfehler" + # MSG_STEALTH_MODE_ON #: 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]" @@ -1273,89 +786,64 @@ 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]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU2 verbunden" # MSG_SELFTEST_MOTOR #: messages.c:83 msgid "Motor" -msgstr "Motor" +msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Bewege Z" +# MSG_NO_MOVE +#: Marlin_main.cpp:5292 +msgid "No move." +msgstr "Keine Bewegung." + +# MSG_NO_CARD +#: ultralcd.cpp:6772 +msgid "No SD card" +msgstr "Keine SD Karte" + # -#: ultralcd.cpp:2973 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "N.V." -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Neue Firmware- Version verfuegbar:" - # MSG_NO #: messages.c:62 msgid "No" msgstr "Nein" +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:7889 +msgid "Not connected" +msgstr "Nicht angeschlossen" + # -#: -msgid "No " -msgstr "Nein" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Keine Pruefsumme mit Zeilennummer, Letzte Zeile: " - -# MSG_NO_MOVE -#: Marlin_main.cpp:5254 -msgid "No move." -msgstr "Keine Bewegung." - -# MSG_NO_CARD -#: ultralcd.cpp:6694 -msgid "No SD card" -msgstr "Keine SD Karte" - -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "Keine Thermistoren - keine Temperatur" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 -msgid "Not connected" -msgstr "Nicht angeschlossen" +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Neue Firmware- Version verfuegbar:" # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 @@ -1363,152 +851,67 @@ msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." -# -#: ultralcd.cpp:4896 -msgid "Now remove the test print from steel sheet." -msgstr "Testdruck jetzt von Stahlblech entfernen." - # MSG_NOZZLE #: messages.c:63 msgid "Nozzle" msgstr "Duese" -# -#: 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" - -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Duesen Luefter:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Duese2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Duese3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1535 +#: 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." -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "offen" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "Fehler beim Oeffnen der Datei: " +# +#: ultralcd.cpp:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Testdruck jetzt von Stahlblech entfernen." -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "Zugriff auf Hauptverzeichnis misslungen" +# +#: ultralcd.cpp:1722 +msgid "Nozzle FAN" +msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Druck pausieren" -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Druck auswaehlen" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "PINDA erwaermen" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA:" - # MSG_PAPER c=20 r=8 #: 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:7795 -msgid "Please check :" -msgstr "Bitte pruefe:" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: 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:4970 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -1517,28 +920,28 @@ msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." 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:7881 +msgid "Please check :" +msgstr "Bitte pruefe:" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: 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:4804 +#: ultralcd.cpp:4894 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: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." - -# 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 "Bitte PLA-Filament\nladen und Assistent\nfortsetzen, indem\nSie den Drucker neu\nstarten." - # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4706 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Bitte laden Sie zuerst PLA Filament." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" @@ -1552,110 +955,75 @@ msgstr "Bitte legen Sie das Stahlblech auf das Heizbett." msgid "Please press the knob to unload filament" msgstr "Bitte druecken Sie den Knopf um das Filament zu entladen." +# +#: ultralcd.cpp:4889 +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:70 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Bitte Filament entfernen und dann den Knopf druecken" -# -#: ultralcd.cpp:4895 -msgid "Please remove shipping helpers first." -msgstr "Bitte zuerst Transportsicherungen entfernen." - # MSG_REMOVE_STEEL_SHEET c=20 r=4 #: 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:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: 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." -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Bitte aktualisieren." - # MSG_PLEASE_WAIT c=20 #: messages.c:66 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Netzfehler" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Einschalten" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Vorheizen" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Vorheizen" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." # -#: 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:2284 -msgid "Preheating to unload" -msgstr "Heizen zum Entladen" - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Filam. bereithalten" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "Knopf druecken" - -# -#: mmu.cpp:723 -msgid "Press the knob to resume nozzle temperature." -msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Netzfehler" # MSG_PRINT_ABORTED c=20 #: messages.c:69 @@ -1663,17 +1031,17 @@ msgid "Print aborted" msgstr "Druck abgebrochen" # -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Druckluefter" +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Heizen zum Laden" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Druckvent.: " +# +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" msgstr "Druckvent.:" @@ -1682,50 +1050,20 @@ msgstr "Druckvent.:" msgid "Print from SD" msgstr "Drucken von SD" +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "Knopf druecken zum" + # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Druck pausiert" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Druckzeit" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Druckzeit: " - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Printer gestoppt. kill() aufgerufen!" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 @@ -1733,112 +1071,47 @@ 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." # -#: 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)" -msgstr "Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 bereit." - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 bereit." - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK." +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "Druckvent." # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" -msgstr "prusa3d.com" +msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Hinten [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Druck wiederherst " -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Erneuern" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Statusbericht Endanschlag" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Wiederholen" +#: +msgid "Prusa i3 MK3S OK." +msgstr "" -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Wiederholen: " +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5774 +msgid "Reset XYZ calibr." +msgstr "Reset XYZ Kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "Ruecksetzen" -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 -msgid "Reset XYZ calibr." -msgstr "XYZ Kalibr. zuruecksetzen." - # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Druck fortsetzen" @@ -1847,143 +1120,93 @@ msgstr "Druck fortsetzen" msgid "Resuming print" msgstr "Druck fortgesetzt" -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Rechts" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" -msgstr "Rechts [um]" - -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Rechts:" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -msgid "Rotate knob until mark reaches extruder body. Click when done." -msgstr "Knopf drehen bis die Markierung das Extrudergehaeuse erreicht. Klicken wenn fertig." +msgstr "Rechts [um]" # MSG_SECOND_SERIAL_ON c=17 r=1 -#: ultralcd.cpp:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "RPi Port [an]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "RPi Port [aus]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "SD Karte [normal]" -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "SD Karte ok" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "SD Karte [FlashAir]" - # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "SD Karte[flshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "SD Init fehlerhaft" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "SD drucke Byte " +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Rechts" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" -# -#: ultralcd.cpp:6601 -msgid "Select" -msgstr "Auswahl" - # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Waehle Sprache" -# -#: ultralcd.cpp:4943 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." - -# -#: ultralcd.cpp:4692 -msgid "Select PLA filament:" -msgstr "PLA Filament auswaehlen:" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " -msgstr "Selbsttest " +msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 msgid "Selftest failed " -msgstr "Selbsttest misslung " +msgstr "Selbsttest Error " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: 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:2138 -msgid "Sensor info" -msgstr "Sensor Info" - -# -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Sensorstatus" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # -#: -msgid "Sensors info" -msgstr "Sensoren Info" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "PLA Filament auswaehlen:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1992,110 +1215,40 @@ msgstr "Temp. einstellen:" msgid "Settings" msgstr "Einstellungen" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -msgstr "Schwerer Schraeglauf" - -# MSG_SEVERE_SKEW c=15 r=1 -#: ultralcd.cpp:2346 -msgid "Severe skew:" -msgstr "Schwerer Verzug:" - -# -#: messages.c:58 -msgid "Sheet" -msgstr "Blech" - # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Endschalter Status" # -#: -msgid "Show pinda state" -msgstr "Pinda-Status anzeigen" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "Schlafzustand..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Leichter Schraeglauf" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Etwas verzogen:" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=4 #: 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:4833 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." - # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5230 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Sort. [ohne]" +msgstr "Sort. [ohne]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5228 +#: ultralcd.cpp:5330 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]" -msgstr "Sort.: [Keine]" - -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sort.: [Keine]" +msgstr "Sort. [Zeit]" -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Sort.: [Zeit]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sort.: [Zeit]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Sort.: [Alphab.]" +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Schwer.Schr:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sort.: [Alphabet]" - -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Sort.: [ohne]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Sort.: [Zeit]" +#: ultralcd.cpp:5331 +msgid "Sort [alphabet]" +msgstr "Sort. [Alphabet]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -2107,33 +1260,33 @@ msgstr "Sortiere Dateien" msgid "Sound [loud]" msgstr "Sound [laut]" +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Leicht.Schr:" + # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" msgstr "Sound [stumm]" +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." + # MSG_SOUND_ONCE c=17 r=1 #: 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:8 msgid "Sound [silent]" msgstr "Sound [leise]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Geschwindigkeit" @@ -2142,41 +1295,16 @@ msgstr "Geschwindigkeit" msgid "Spinning" msgstr "Dreht sich" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [an]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/V]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [aus]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2185,60 +1313,55 @@ msgstr "Druck abbrechen" # MSG_STOPPED #: messages.c:94 msgid "STOPPED. " -msgstr "GESTOPPT. " +msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" -msgstr "Support" +msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Ausgetauscht" # MSG_TEMP_CALIBRATION c=20 r=1 #: messages.c:95 msgid "Temp. cal. " -msgstr "Temp Kalib. " +msgstr "Temp Kalib. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Temp. Kal. [AN]" +msgstr "Temp. Kal. [an]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Temp. Kal. [AUS]" +msgstr "Temp. Kal. [aus]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Temp. kalibrieren" -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Temperatur" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -msgid "Temperature calibration has not been run yet" -msgstr "Temperatur wurde\nnoch nicht\nkalibriert" - # MSG_TEMP_CALIBRATION_DONE c=20 r=12 #: 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:5650 +msgid "Temperature" +msgstr "Temperatur" + # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperaturen" @@ -2248,162 +1371,107 @@ 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:2217 -msgid "to load filament" -msgstr "zum Filament laden" - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "zum Filament entladen" - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Gesamt" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Gesamte Fehler" - -# -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Gesamtes Filament" -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Gesamtes Filament:" - # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Gesamte Druckzeit" -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Gesamte Druckzeit:" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "AUSGELOEST" - # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Feineinstellung" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "unbekannt" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Entladen" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Alles entladen" +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Gesamte Fehler" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "Filament laden" + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "Filament entladen" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Filament entladen" -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Filam. 1 entladen" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Filam. 2 entladen" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Filam. 3 entladen" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Filam. 4 entladen" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: 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." +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Spannungen" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "Dateisystem Init fehlerhaft" +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 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:3335 +#: ultralcd.cpp:3422 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" +# +#: ultralcd.cpp:4868 +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:1527 +#: 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:1519 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" @@ -2413,146 +1481,337 @@ msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Assistent" -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "Arbeitsverzeichnis oeffnen misslungen" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Schreibe in Datei: " - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-Korrektur" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "X-Korrektur:" - # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Ja" + +# MSG_WIZARD_QUIT c=20 r=8 +#: 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:3835 +#: ultralcd.cpp:3922 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:3832 +#: ultralcd.cpp:3919 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:5130 +msgid "X-correct:" +msgstr "X-Korrektur:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Vordere Kalibrierpunkte 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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Alle laden" + # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3801 +#: ultralcd.cpp:3888 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_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." - -# -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3891 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:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glueckwunsch!" +"XYZ calibration failed. Right front calibration point not reachable." +#: +msgid "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." +msgstr # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Y Entfernung vom Min" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Y Entfernung vom Min:" +# +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Y-Korrektur:" + +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [aus]" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-Korrektur" +#: messages.c:57 +msgid "Back" +msgstr "Zurueck" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Y-Korrektur:" +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Kontrolle" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Ja" +# +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Falschtriggerung" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Sie benutzen eine\nAlpha Firmware\nVersion. Dies ist\neine Entwicklungs-\nversion. Die Ver-\nwendung ist nicht\nempfohlen und kann\nzu Schaeden fuehren." +# +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "" -# 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 "Sie benutzen eine\nBeta Firmware\nVersion. Dies ist\neine Entwicklungs-\nversion. Die Ver-\nwendung ist nicht\nempfohlen und kann\nzu Schaeden fuehren." +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware [ohne]" -# MSG_WIZARD_QUIT c=20 r=8 -#: 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:5551 +msgid "Firmware [strict]" +msgstr "Firmware [strikt]" + +# +#: ultralcd.cpp:5548 +msgid "Firmware [warn]" +msgstr "Firmware [warnen]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "HW Einstellungen" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Magnet Komp. [nv]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Magnet Komp. [Aus]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Magnet Komp. [An]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "Gitter [3x3]" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "Gitter [7x7]" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "MeshBett Ausgleich" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "MMU Modus[Normal]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "MMU Mod.[Stealth]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Modell [ohne]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Modell [strikt]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Modell [warnen]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Duese D. [0.25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Duese D. [0.40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Duese D. [0.60]" + +# +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Duese [ohne]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Duese [strikt]" + +# +#: ultralcd.cpp:5424 +msgid "Nozzle [warn]" +msgstr "Duese [warnen]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-Code ist fuer 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 fuer 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 fuer 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 fuer 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 fuer eine neuere Firmware geslict. Fortfahren?" # -#: ultralcd.cpp:5030 +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# +#: ultralcd.cpp:2462 +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:6683 +msgid "Rename" +msgstr "Umbenennen" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Auswahl" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Sensor Info" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Blech" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Sound [Assist]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Stahlbleche" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Z-Korrektur:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" msgstr "Z-Probe Nr. [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" msgstr "Z-Probe Nr. [3]" -# MSG_MEASURED_OFFSET -#: 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 8f4d21b54c..bf8e95ab0a 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into Spanish. +# msgid "" msgstr "" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -msgstr "\e[2JDec. choque\e[1;0Hpuede ser activada solo en\e[2;0HModo normal" - -# 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[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: " -msgstr " PlannerBufferBytes: " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr "[inactivo" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr "extrusion en frio prevenida" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr "Memoria Libre: " - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr "Ultima actualizacion: " +"Language: es\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:30:59 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:30:59 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,48 +25,33 @@ msgstr " de 4" msgid " of 9" msgstr " de 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr " [apagado]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Fact" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "[0;0] punto offset" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Dec. choque puede\x0aser activada solo en\x0aModo normal" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Cancelar" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustar Z" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Ajustando Z:" - -# MSG_ALL c=19 r=1 -#: messages.c:11 -msgid "All" -msgstr "Todos" +msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Todo bien" @@ -108,39 +61,34 @@ msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Ajustar Eje Z" - # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "Auto agotar[on]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "Auto agotar[N/A]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "Auto agotar[off]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -148,52 +96,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "Carga automatica de filamento" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 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:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Eje" - # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Longitud del eje" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Micropasos X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -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_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -208,7 +136,7 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Corr. de la cama" @@ -217,23 +145,13 @@ 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_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Comienzo lista arch. " +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Base" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Estado de la correa" @@ -242,18 +160,13 @@ msgstr "Estado de la correa" msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4566 -msgid "Calibrate" -msgstr "Calibrar" - -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Calibrar E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -262,13 +175,13 @@ msgstr "Calibrar XYZ" msgid "Calibrate Z" msgstr "Calibrar Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Calibrando posicion inicial" +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." @@ -278,132 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:816 +msgid "Calibration done" +msgstr "Calibracion OK" + # MSG_MENU_CALIBRATION #: messages.c:61 msgid "Calibration" msgstr "Calibracion" -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 -msgid "Calibration done" -msgstr "Calibracion OK" - # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Cancelar" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Sin acceso subdir: " - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "No se puede abrir subdir" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Tarjeta insertada" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Tarjeta retirada" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambiar extrusor." - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Cambiar filamento" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Cambiar tarjeta SD" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Cambio correcto" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Cambio correcto?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Cambiando filamento" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Control base cal." - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Control endstops" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Control fusor" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Comprobando los sensores" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Control sensor X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Control sensor Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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 "error de checksum, Ult. Linea: " - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Elegir extrusor:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Elije filamento:" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Color no homogeneo" @@ -413,20 +226,10 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Copiar idioma seleccionado desde XFLASH?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Choque" - # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" @@ -448,27 +251,27 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Apagar motores" @@ -478,124 +281,69 @@ 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:4968 +#: ultralcd.cpp:5070 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_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "E calibrado. Limpia nozzle. Haz clic una vez terminado." - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "E-correcion" - # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" -msgstr "Correccion-E:" - -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Expulsar" +msgstr "Corregir-E:" # MSG_EJECT_FILAMENT c=17 r=1 #: 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:4869 +msgid "Eject" +msgstr "Expulsar" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Expulsando filamento" -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Fin lista arch. " - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 -msgid "Endstop" -msgstr "Endstop" - # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 +#: ultralcd.cpp:7917 msgid "Endstop not hit" msgstr "Endstop no alcanzado" +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:7911 +msgid "Endstop" +msgstr "" + # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" -msgstr "Endstops" - -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "endstops golpean: " - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Espanol" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "en cola \"" +msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "error al escribir arch." +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." # MSG_ERROR #: messages.c:28 msgid "ERROR:" -msgstr "ERROR:" +msgstr "" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: 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." +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8304 +msgid "Extruder fan:" +msgstr "Vent.extrusor:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "No responde el flasheo externo SPI W25X20CL" +# MSG_INFO_EXTRUDER c=15 r=1 +#: ultralcd.cpp:2244 +msgid "Extruder info" +msgstr "Informacion del extrusor" # MSG_MOVE_E #: messages.c:29 @@ -603,37 +351,12 @@ msgid "Extruder" msgstr "Extruir" # -#: 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:8218 -msgid "Extruder fan:" -msgstr "Ventilador del extrusor:" - -# MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 -msgid "Extruder info" -msgstr "Informacion del extrusor" +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "Estadistica de fallos MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" msgstr "Autocarg.Fil[act]" @@ -643,25 +366,15 @@ msgid "F. autoload [N/A]" msgstr "Autocarg.Fil[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autocarg.Fil[ina]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Estadistica de fallos" -# -#: 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" @@ -673,12 +386,12 @@ msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Comprob.vent[act]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Comprob.vent[ina]" @@ -687,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:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Sensor Fil. [N/D]" @@ -703,22 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Sensor Fil. [ina]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. acabado" -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filamento" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. no introducido" @@ -727,68 +430,33 @@ msgstr "Fil. no introducido" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filamento usado" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Filamento usado: " +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Tiempo de imp.:" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "Arch. abierto: " - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -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 #: messages.c:105 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 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." @@ -798,14 +466,14 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 @@ -813,57 +481,22 @@ msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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:7801 -msgid "Heater/Thermistor" -msgstr "Calentador/Termistor" - -# MSG_HEATING -#: messages.c:46 -msgid "Heating" -msgstr "Calentando..." +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:7887 +msgid "Heater/Thermistor" +msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -872,148 +505,163 @@ msgstr "Calentadores desactivados por el temporizador de seguridad." msgid "Heating done." msgstr "Calentamiento acabado." +# MSG_HEATING +#: messages.c:46 +msgid "Heating" +msgstr "Calentando..." + # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "Configuracion HW" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Cambiar filamento" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Cambio correcto" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Cambio correcto?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Control base cal." + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Control endstops" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Control fusor" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Comprobando los sensores" + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Control sensor X" + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Control sensor Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Control sensor Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Elegir extrusor:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Elije filamento:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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:4897 +#: ultralcd.cpp:4999 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:4962 +#: ultralcd.cpp:5064 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:99 msgid "Info screen" msgstr "Monitorizar" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Iniciar tarj. SD" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "?Esta cargado el filamento 1?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Introducir filamento" -# 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: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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Es el filamento PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Esta el filamento PLA cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 #: 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 " - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "PARADA DE EMERGENCIA" - -# -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Ultima impresion" +msgstr "?Esta colocada la lamina de acero sobre la base?" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Izquierda" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Ultima impresion" # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Izquierda" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Izquierda [um]" -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Izda:" - # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -1022,48 +670,13 @@ msgstr "Correccion de Linealidad" msgid "Live adjust Z" msgstr "Micropaso Eje Z" -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Intr. todos fil." - # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Introducir filam." -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Introducir fil. 1" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Introducir fil. 2" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Introducir fil. 3" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Introducir fil. 4" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Introducir fil. 5" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "Cargar a la boquilla" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Cambiando color" @@ -1073,175 +686,70 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Polea suelta" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 Extrusor invalido" - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 Extrusor invalido" - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 Extrusor invalido" +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "Cargar a la boquilla" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 Extrusor invalido" - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 Extrusor invalido" - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" msgstr "Menu principal" -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -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:3002 -msgid "Measured skew" -msgstr "Desviacion medida:" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Desviación medida:" - # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Nivelacion Malla Base" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Restaurando posicion..." -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Firmware MK3 detectado en impresora MK3S" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Restaurando temperatura..." # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S detectado en impresora MK3" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Desviacion med:" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Fallos MMU" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Carga MMU falla" -# -#: 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." - -# 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 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:762 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Restaurando posicion..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Restaurando temperatura..." - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "Fallo de energia en MMU" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU2 conectado" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" @@ -1252,16 +760,21 @@ msgstr "Modo [Normal]" msgid "Mode [silent]" msgstr "Modo [silencio]" +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "MMU necesita atencion del usuario." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "Fallo de energia en MMU" + # MSG_STEALTH_MODE_ON #: 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]" @@ -1273,242 +786,132 @@ 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]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU2 conectado" # MSG_SELFTEST_MOTOR #: messages.c:83 msgid "Motor" -msgstr "Motor" +msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Mover Z" -# -#: ultralcd.cpp:2973 -msgid "N/A" -msgstr "No disponible" +# MSG_NO_MOVE +#: Marlin_main.cpp:5292 +msgid "No move." +msgstr "Sin movimiento" + +# MSG_NO_CARD +#: ultralcd.cpp:6772 +msgid "No SD card" +msgstr "No hay tarjeta SD" # -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nuevo firmware disponible:" +#: ultralcd.cpp:3024 +msgid "N/A" +msgstr "N/A" # MSG_NO #: messages.c:62 msgid "No" -msgstr "No" - -# -#: -msgid "No " -msgstr "No" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Sin Checksum con linea numero, Ult. Linea: " - -# MSG_NO_MOVE -#: Marlin_main.cpp:5254 -msgid "No move." -msgstr "Sin movimiento" - -# MSG_NO_CARD -#: ultralcd.cpp:6694 -msgid "No SD card" -msgstr "No hay tarjeta SD" - -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "Sin termistores - sin temperatura" +msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "No hay conexion " +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nuevo firmware disponible:" + # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." -msgstr "Ahora precalentare la boquilla para PLA ." - -# -#: ultralcd.cpp:4896 -msgid "Now remove the test print from steel sheet." -msgstr "Ahora retira la prueba de la lamina de acero." +msgstr "Ahora precalentare la boquilla para PLA." # MSG_NOZZLE #: messages.c:63 msgid "Nozzle" msgstr "Boquilla" -# -#: 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" - -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Ventilador de capa:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Boquilla2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Boquilla3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1535 +#: 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" -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "abrir" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "error apertura, Arch.: " +# +#: ultralcd.cpp:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Ahora retira la prueba de la lamina de acero." -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "fallo openRoot " +# +#: ultralcd.cpp:1722 +msgid "Nozzle FAN" +msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pausar impresion" -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Esc. Modelo Adecuado" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Calentando PINDA" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA:" - # MSG_PAPER c=20 r=8 #: 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:7795 -msgid "Please check :" -msgstr "Controla :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: 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:4970 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -1517,28 +920,28 @@ msgstr "Limpia la superficie de la base, por favor, y haz clic" msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." +# MSG_SELFTEST_PLEASECHECK +#: ultralcd.cpp:7881 +msgid "Please check :" +msgstr "Controla :" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: 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:4804 +#: ultralcd.cpp:4894 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: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 y reinicia la impresora para continuar con el asistente" - # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4706 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Carga el filamento PLA primero por favor." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." @@ -1552,110 +955,75 @@ msgstr "Por favor coloca la chapa de acero en la base calefactable." msgid "Please press the knob to unload filament" msgstr "Por favor, pulsa el dial para descargar el filamento" +# +#: ultralcd.cpp:4889 +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:70 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Por favor quite el filamento y luego presione el dial." -# -#: 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: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:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: 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." -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Actualize por favor" - # MSG_PLEASE_WAIT c=20 #: messages.c:66 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Cortes de energia" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Encendido" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Precalentar" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Por favor retira los soportes de envio primero." # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Precalentar" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." # -#: 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:2284 -msgid "Preheating to unload" -msgstr "Precalentar para descargar" - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Preparar filamento" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "Pulsa el dial" - -# -#: mmu.cpp:723 -msgid "Press the knob to resume nozzle temperature." -msgstr "Presiona el dial para continuar con la temperatura de la boquilla." +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Cortes de energia" # MSG_PRINT_ABORTED c=20 #: messages.c:69 @@ -1663,69 +1031,39 @@ msgid "Print aborted" msgstr "Impresion cancelada" # -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Ventilador del extrusor" +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Precalentar para cargar" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Ventilador del fusor:" +# +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Precalentar para descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventilador del fusor:" +msgstr "Vent.fusor:" # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" msgstr "Menu tarjeta SD" +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "Pulsa el dial" + # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Impresion en pausa" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Tiempo de imp.:" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Tiempo de imp.:" - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Impresora detenida. kill() activado!" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Presiona el dial para continuar con la temperatura de la boquilla." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 @@ -1733,112 +1071,47 @@ 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." # -#: 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)" -msgstr "Impresora parada debido a errores. Arregle el error y use M999 para reinicio. (Temperatura se resetea. Ajustar despues de reinicio)" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Preparado para i3 MK2." - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 prep." - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK." +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "Vent.extr" # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Trasera [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recuperando impresion" -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Refrescar" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Estado endstop" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Reenviar: " +#: +msgid "Prusa i3 MK3S OK." +msgstr "" -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Reenviar: " +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5774 +msgid "Reset XYZ calibr." +msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3296 msgid "Reset" -msgstr "Reset" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 -msgid "Reset XYZ calibr." -msgstr "Reset XYZ calibr." +msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Reanudar impres." @@ -1847,113 +1120,68 @@ msgstr "Reanudar impres." msgid "Resuming print" msgstr "Continuando impresion" -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Derecha" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Derecha [um]" -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Der:" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -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:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Puerto RPi [act]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Puerto RPi [ina]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Tarj. SD [normal]" -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "Tarj. SD ok" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "Tarj. SD [FlshAir]" - # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Tarj. SD[FlshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "Error init SD" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "SD byte impresion" +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Derecha" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" -# -#: ultralcd.cpp:6601 -msgid "Select" -msgstr "Seleccionar" - # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Cambiar el idioma" -# -#: 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:4692 -msgid "Select PLA filament:" -msgstr "Seleccionar filamento PLA:" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" -msgstr "Self test OK" +msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Error Selftest !" @@ -1963,27 +1191,22 @@ msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: 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:2138 -msgid "Sensor info" -msgstr "Info sensor" - -# -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Estado del sensor" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # -#: -msgid "Sensors info" -msgstr "Informacion sensores" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "Seleccionar filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1992,110 +1215,40 @@ msgstr "Establecer temp.:" msgid "Settings" msgstr "Configuracion" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -msgstr "Inclinacion severa" - -# MSG_SEVERE_SKEW c=15 r=1 -#: ultralcd.cpp:2346 -msgid "Severe skew:" -msgstr "Inclinación severa:" - -# -#: messages.c:58 -msgid "Sheet" -msgstr "Lamina" - # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Mostrar endstops" # -#: -msgid "Show pinda state" -msgstr "Mostrar estado pinda" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "En reposo..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Ligeramente inclinado" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Ligeramente inclinado:" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=4 #: 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:4833 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Problema encontrado, nivelacion Z forzosa ..." - # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5230 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Ordenar [ninguno]" +msgstr "Ordenar [ninguno]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5228 +#: ultralcd.cpp:5330 msgid "Sort [time]" -msgstr "Ordenar [tiempo]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5229 -msgid "Sort [alphabet]" -msgstr "Ordenar [Alfabetico]" +msgstr "Ordenar [fecha]" -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:4250 -msgid "Sort: [None]" -msgstr "Ordena: [Ninguno]" - -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordenar: [nada]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Orden: [Fecha]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Orden: [Fecha]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Orden: [Alfabético]" +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Incl.severa:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordenar:[alfabet]" - -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Ordenar: [nada]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Ordenar: [tiempo]" +#: ultralcd.cpp:5331 +msgid "Sort [alphabet]" +msgstr "Ordenar [alfabet]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -2107,33 +1260,33 @@ msgstr "Ordenando archivos" msgid "Sound [loud]" msgstr "Sonido [alto]" +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Liger.incl.:" + # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" msgstr "Sonido[silenciad]" +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Problema encontrado, nivelacion Z forzosa ..." + # MSG_SOUND_ONCE c=17 r=1 #: 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:8 msgid "Sound [silent]" msgstr "Sonido[silencios]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Velocidad" @@ -2142,41 +1295,16 @@ msgstr "Velocidad" msgid "Spinning" msgstr "Ventilador girando" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2188,12 +1316,12 @@ msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Intercambiado" @@ -2203,42 +1331,37 @@ msgid "Temp. cal. " msgstr "Cal. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Cal. temp. [ON]" +msgstr "Cal. temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Cal. temp. [OFF]" +msgstr "Cal. temp. [off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calibracion temp." -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Temperatura" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -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: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:5650 +msgid "Temperature" +msgstr "Temperatura" + # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperaturas" @@ -2248,164 +1371,109 @@ 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:2217 -msgid "to load filament" -msgstr "para cargar el filamento" - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "para descargar el filamento" - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Total" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Fallos totales" - -# -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filamento total:" -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Filamento total:" - # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Tiempo total :" -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Tiempo total :" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "ACTIVADO" - # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Ajustar" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "desconocido" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Descargar" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Soltar todos fil." +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Fallos totales" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "para cargar el filamento" + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "para descargar el filamento" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Soltar filamento" -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Soltar fil. 1" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Soltar fil. 2" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Soltar fil. 3" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Soltar fil. 4" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Soltando filamento" # -#: 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" +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Voltajes" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "fallo volume.init \n" +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 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:3335 +#: ultralcd.cpp:3422 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" +# +#: ultralcd.cpp:4868 +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:1527 +#: 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:1519 +#: 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:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" -msgstr "?Se cargo con exito el filamento?" +msgstr "?Se cargocon exito el filamento?" # MSG_SELFTEST_WIRINGERROR #: messages.c:85 @@ -2413,146 +1481,332 @@ msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" -msgstr "Wizard" - -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "error al abrir workDir" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Escribiendo al arch.: " - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "X-correcion" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "Correccion-X:" +msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Detalles de calibracion XYZ" +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Calibracion XYZ fallada. Consulta el manual por favor." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Si" + +# MSG_WIZARD_QUIT c=20 r=8 +#: 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:3835 +#: ultralcd.cpp:3922 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:3832 +#: ultralcd.cpp:3919 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:5130 +msgid "X-correct:" +msgstr "Corregir-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazion XYZ comprometida. Puntos frontales no alcanzables." -# 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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Intr. todos fil." + # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3801 +#: ultralcd.cpp:3888 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_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibracion XYZ fallada. Consulta el manual por favor." - -# -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3891 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:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" - # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Distancia en Y desde el min" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Distancia en Y desde el min:" +# +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Corregir-Y:" + +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "[apag]" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Y-correccion" +#: messages.c:57 +msgid "Back" +msgstr "atras" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Correccion-Y:" +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Comprobaciones" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Si" +# +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Falsa activacion" + +# +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "FINDA:" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Estas usando una version alpha de firmware. Esta es una version de desarrollo. No recomendamos usar esta version y podria causar daños a la impresora." +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware[ninguno]" -# 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 "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." +# +#: ultralcd.cpp:5551 +msgid "Firmware [strict]" +msgstr "Firmware[estrict]" -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:103 -msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Siempre puedes acceder al asistente desde Calibracion -> Wizard" +# +#: ultralcd.cpp:5548 +msgid "Firmware [warn]" +msgstr "Firmware [aviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Configuracion HW" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Comp. imanes [N/A]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Comp. imanes [Off]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Comp. imanes [On]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "Malla [3x3]" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "Malla [7x7]" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "Nivelacion Malla Base" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectado en impresora MK3" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "Modo MMU [Normal]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "Modo MMU[Silenci]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Modelo [ninguno]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Modelo [estricto]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Modelo [aviso]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Diam. nozzl[0.25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Diam. nozzl[0.40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Diam. nozzl[0.60]" + +# +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Nozzle [ninguno]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Nozzle [estricto]" + +# +#: ultralcd.cpp:5424 +msgid "Nozzle [warn]" +msgstr "Nozzle [aviso]" + +# +#: util.cpp:510 +msgid "G-code sliced for a different level. Continue?" +msgstr "Codigo 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 "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +#: util.cpp:427 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Codigo 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 "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +#: util.cpp:477 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Codigo G laminado para nuevo firmware. ?Continuar?" + +# +#: util.cpp:483 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "PINDA:" + +# +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Precalentando para laminar" + +# +#: ultralcd.cpp:2462 +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:5030 +#: ultralcd.cpp:6683 +msgid "Rename" +msgstr "Renombrar" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Seleccionar" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Info sensor" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Lamina" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Sonido [asistido]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Lamina de acero" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" -msgstr "Correccion-Z:" +msgstr "Corregir-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "Z-sensor nr. [1]" +msgstr "Z-sensor nr. [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" -msgstr "Z-sensor nr. [3]" +msgstr "Z-sensor nr. [3]" -# MSG_MEASURED_OFFSET -#: 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 cd2975bc62..344b732922 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into French. +# msgid "" msgstr "" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -msgstr "\e[2JLa detection de crash peut etre\e[1;0Hactive seulement\e[2;0Hen mode Normal" - -# 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[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: " -msgstr " PlannerBufferBytes : " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr " [off" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr "extrusion a froid \nevitee" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr "Memoire libre :" - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr "Derniere MAJ :" +"Language: fr\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:32:08 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:32:08 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,90 +25,70 @@ msgstr "de 4" msgid " of 9" msgstr "de 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr "[off]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Facteur" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "Offset point [0;0]" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "La detection de\x0acrash peut etre\x0aactive seulement en\x0amode Normal" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Annuler" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Ajustement de Z" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Ajuster Z :" - -# MSG_ALL c=19 r=1 -#: messages.c:11 -msgid "All" -msgstr "Tous" +msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 #: messages.c:101 msgid "All is done. Happy printing!" -msgstr "Tout est pret. Bonne\nimpression !" +msgstr "Tout est pret. Bonne impression!" # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiant" # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "et pressez le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" -msgstr "Z~carriages gauche +\ndroite tout en haut?" - -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Ajustement Z auto ?" +msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "Purge auto [on]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "Vidage auto[N/A]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "Purge auto [off]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -148,52 +96,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "AutoCharge du filament" +msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "Chargement auto du\nfilament uniquement\nsi le capteur de\nfilament est active." +msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Axe" +msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Longueur de l'axe" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Babystepping X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -msgid "Babystepping Y" -msgstr "Babystepping Y" - -# -#: messages.c:57 -msgid "Back" -msgstr "Retour" - -# MSG_BED -#: messages.c:15 -msgid "Bed" -msgstr "Lit" +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -208,52 +136,37 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" 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 bed leveling.\nCapt. non declenche.\nDebris sur buse ? En\nattente d'un reset." +msgstr "Echec bed leveling. 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\nCapteur deconnecte\nou cable casse. En\nattente 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 bed leveling.\nCapt. declenche\ntrop trop haut. En\nattente d'un reset." - -# MSG_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Debut liste fichiers" +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Lit" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 #: messages.c:71 msgid "Blackout occurred. Recover print?" -msgstr "Coupure detectee.\nRecup. impression ?" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4566 -msgid "Calibrate" -msgstr "Calibrer" +msgstr "Coupure detectee. Reprendre impression?" -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Calibrer E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -262,148 +175,48 @@ msgstr "Calibrer XYZ" msgid "Calibrate Z" msgstr "Calibrer Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Calib. mise a 0" +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." +msgstr "Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_CALIBRATE_Z_AUTO c=20 r=2 #: messages.c:20 msgid "Calibrating Z" -msgstr "Calibration de Z" +msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:61 -msgid "Calibration" -msgstr "Calibration" +msgstr "Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 +#: ultralcd.cpp:816 msgid "Calibration done" msgstr "Calibration terminee" +# MSG_MENU_CALIBRATION +#: messages.c:61 +msgid "Calibration" +msgstr "" + # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Annuler" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Impossible d'entrer\ndans le repertoire :" - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "Impossible d'ouvrir\nle repertoire" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Carte inseree" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Carte retiree" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Changer extrudeur" - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Changer filament" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Changer carte SD" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Changement reussi!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Change correctement?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Changement filament!" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Verification du lit" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Verifications butees" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Verif. tete impr." - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Verif. des capteurs" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Verification axe X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Verification axe Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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: " -msgstr "dissemblance du checksum, Derniere Ligne :" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Choisir extrudeur :" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Choix du filament :" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -413,34 +226,24 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Copier la langue selectionne depuis la XFLASH ?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" -msgstr "Copier la langue\nselectionne ?" - -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Crash" +msgstr "Copier la langue selectionne?" # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" -msgstr "Detect. crash[on]" +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 @@ -448,154 +251,99 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 msgid "Crash detected. Resume print?" -msgstr "Crash detecte. Poursuivre l'impression ?" +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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" -msgstr "Date :" +msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 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\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." +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:4968 +#: ultralcd.cpp:5070 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 ?" - -# MSG_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "Calibration de E\nterminee. Nettoyez\nla buse. Cliquez une\nfois fait." - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correct-E" +msgstr "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Correct-E:" -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Ejecter" - # MSG_EJECT_FILAMENT c=17 r=1 #: 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" +msgstr "Remonter le fil." -# 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" +# +#: ultralcd.cpp:4869 +msgid "Eject" +msgstr "Remonter" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" -msgstr "Ejection filament" +msgstr "Le fil. remonte" -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Fin liste fichiers" +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +#: ultralcd.cpp:7917 +msgid "Endstop not hit" +msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Butee" -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 -msgid "Endstop not hit" -msgstr "Butee non atteinte" - # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Butees" -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "butees atteintes :" - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Francais" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "mise en file \"" - # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" -msgstr "Erreur - la memoire\nstatique a ete\necrasee" +msgstr "Erreur - la memoire statique a ete ecrasee" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "erreur d'ecriture du fichier" +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." # MSG_ERROR #: messages.c:28 msgid "ERROR:" -msgstr "ERREUR :" +msgstr "ERREUR:" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: 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." +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8304 +msgid "Extruder fan:" +msgstr "Ventilo extrudeur:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "La Flash SPI externe W25X20CL ne repond pas." +# MSG_INFO_EXTRUDER c=15 r=1 +#: ultralcd.cpp:2244 +msgid "Extruder info" +msgstr "Infos extrudeur" # MSG_MOVE_E #: messages.c:29 @@ -603,99 +351,59 @@ msgid "Extruder" msgstr "Extrudeur" # -#: 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:8218 -msgid "Extruder fan:" -msgstr "Ventilo extrudeur:" - -# MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 -msgid "Extruder info" -msgstr "Infos extrudeur" +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "Stat. d'echec MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "ChargAuto f. [on]" +msgstr "Autochargeur [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 msgid "F. autoload [N/A]" -msgstr "AutoCharg F [N/A]" +msgstr "Autochargeur[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" -msgstr "AutoCharg F [off]" +msgstr "Autochargeur[off]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" -msgstr "Statist. d'echec" - -# -#: ultralcd.cpp:6760 -msgid "Fail stats MMU" -msgstr "Stat. echecs MMU" - -# -#: ultralcd.cpp:7887 -msgid "False triggering" -msgstr "Faux declenchement" +msgstr "Stat. d'echec" # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" -msgstr "Vitesse ventil" +msgstr "Vitesse vent." # MSG_SELFTEST_FAN c=20 #: messages.c:78 msgid "Fan test" -msgstr "Test ventilateur" +msgstr "Test du ventilateur" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" -msgstr "Verif ventilo[on]" +msgstr "Verif vent. [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" -msgstr "Verif venti [off]" +msgstr "Verif vent. [off]" # MSG_FSENSOR_ON #: messages.c:45 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 "Capteur de fil. non\nprecis, desactiver ?" - # MSG_FSENSOR_NA -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" -msgstr "Capteur Fil. [N/A]" +msgstr "Capteur Fil.[N/A]" # MSG_FSENSOR_OFF #: messages.c:44 @@ -703,22 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Capteur Fil.[off]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Fins de filament" -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filament" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament extrude et\navec bonne couleur ?" +msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Filament non charge" @@ -727,60 +430,25 @@ msgstr "Filament non charge" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filament utilise" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Filament utilise :" +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Temps d'impression" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" -msgstr "Fichier incomplet.\nContinuer qd meme ?" - -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "Fichier ouvert :" - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -msgid "File selected" -msgstr "Fichier selectionne" - -# -#: ultralcd.cpp:3943 -msgid "FINDA:" -msgstr "FINDA :" +msgstr "Fichier incomplet. Continuer qd meme?" # 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]" +msgstr "Mouvement final" # MSG_V2_CALIBRATION c=17 r=1 #: messages.c:105 @@ -788,469 +456,324 @@ msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 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." +msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." # #: 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." +msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 msgid "Front print fan?" -msgstr "Ventilo impr avant ?" +msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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?" +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:7887 +msgid "Heater/Thermistor" +msgstr "Chauffage/Thermistor" -# -#: 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. " +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:8467 +msgid "Heating disabled by safety timer." +msgstr "Chauffage desactivee par le compteur de securite." -# -#: 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:7801 -msgid "Heater/Thermistor" -msgstr "Chauffage/Thermistor" +# MSG_HEATING_COMPLETE c=20 +#: messages.c:47 +msgid "Heating done." +msgstr "Chauffe terminee." # MSG_HEATING #: messages.c:46 msgid "Heating" msgstr "Chauffe" -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 -msgid "Heating disabled by safety timer." -msgstr "Chauffe desactivee\npar le compteur de\nsecurite." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:47 -msgid "Heating done." -msgstr "Chauffe terminee." - # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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 ?" +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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "Config HW" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Changer filament" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Changement reussi!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Change correctement?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Verification du lit" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Verification butees" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Verif. du hotend" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Verif. des capteurs" + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Verification axe X" + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Verification axe Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Verification axe Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Choisir extrudeur:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Choix du filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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." +msgstr "Je vais maintenant lancer la calibration XYZ. Cela prendra 12 min environ." # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4897 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." -msgstr "Je vais maintenant\nlancer la\ncalibration z." +msgstr "Je vais maintenant lancer la calibration Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4962 +#: ultralcd.cpp:5064 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" - -# 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:99 msgid "Info screen" msgstr "Ecran d'info" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Init. carte SD" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "Fil.1 est-il charge?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Inserez le filament" -# MSG_FILAMENT_LOADING_T0 c=20 r=4 -#: messages.c:33 -msgid "Insert filament into extruder 1. Click when done." -msgstr "Inserez le filament\ndans l'extrudeur 1.\nCliquez une fois\npret." - -# MSG_FILAMENT_LOADING_T1 c=20 r=4 -#: messages.c:34 -msgid "Insert filament into extruder 2. Click when done." -msgstr "Inserez le filament\ndans l'extrudeur 2.\nCliquez une fois\npret." - -# MSG_FILAMENT_LOADING_T2 c=20 r=4 -#: messages.c:35 -msgid "Insert filament into extruder 3. Click when done." -msgstr "Inserez le filament\ndans l'extrudeur 3.\nCliquez une fois\npret." - -# MSG_FILAMENT_LOADING_T3 c=20 r=4 -#: messages.c:36 -msgid "Insert filament into extruder 4. Click when done." -msgstr "Inserez le filament\ndans l'extrudeur 4.\nCliquez une fois\npret." - -# -#: 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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" -msgstr "Le filament est-il\ncharge ?" +msgstr "Fil. est-il charge?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" -msgstr "Est-ce du filament\nPLA ?" +msgstr "Est-ce du filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" -msgstr "Le filament PLA\nest-il charge ?" +msgstr "Fil. PLA est-il charge?" # MSG_STEEL_SHEET_CHECK c=20 r=2 #: messages.c:92 msgid "Is steel sheet on heatbed?" -msgstr "Feuille d'acier sur\nplateau chauffant ?" - -# MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 -#: mesh_bed_calibration.cpp:2223 -msgid "Iteration " -msgstr "Iteration " - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "TUE." +msgstr "Plaque d'impression sur le lit chauffant?" # -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Derniere impression" - -# -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" -msgstr "Echecs derniere impr" +msgstr "Echecs derniere imp." # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Gauche" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Derniere impres." # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Ventilo tete gauche?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Gauche" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Gauche [um]" -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Gauche :" - # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" msgstr "Correction lin." # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" -msgstr "Ajuster Z en direct" - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Tout charger" +msgstr "Ajuster Z en dir." # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Charger filament" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Charger fil. 1" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Charger fil. 2" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Charger fil. 3" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Charger fil. 4" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Charger fil. 5" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "Charger dans la buse" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" -msgstr "Chargement couleur" +msgstr "Charg. de la couleur" # MSG_LOADING_FILAMENT c=20 #: messages.c:52 msgid "Loading filament" -msgstr "Chargement filament" +msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Poulie lache" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 extrudeur invalide" - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 extrudeur invalide" - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 extrudeur invalide" +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "Charger la buse" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 extrudeur invalide" - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 extrudeur invalide" - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" -msgstr "Principal" - -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -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:3002 -msgid "Measured skew" -msgstr "Deviation mesuree" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Ecart mesure :" +msgstr "Menu principal" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh Bed Leveling" +msgstr "" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Mesh bed leveling" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Reprise de la position ..." -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Firmware MK3 detecte sur imprimante MK3S" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Rechauffage de la buse..." # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S detecte sur imprimante MK3" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Deviat.mesuree" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" -msgstr "Echec MMU" +msgstr "Echecs MMU" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Echecs charg. MMU" -# -#: 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." - -# 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 "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:762 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Reprise de la position ..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Remontee en\ntemperature..." - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "Echecs alim. MMU" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU2 connecte" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" -msgstr "Mode [Normal]" +msgstr "" # MSG_SILENT_MODE_ON #: messages.c:89 msgid "Mode [silent]" -msgstr "Mode [silencieux]" +msgstr "Mode [feutre]" + +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "Le MMU necessite l'attention de l'utilisateur." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "Echecs alim. MMU" # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Mode [Furtif]" - -# -#: ultralcd.cpp:4424 -msgid "Mode change in progress ..." -msgstr "Changement de mode en cours..." +msgstr "Mode [furtif]" # MSG_AUTO_MODE_ON #: messages.c:12 @@ -1260,22 +783,12 @@ msgstr "Mode [puiss.auto]" # MSG_SILENT_MODE_OFF #: messages.c:88 msgid "Mode [high power]" -msgstr "Mode [haute puiss]" - -# -#: ultralcd.cpp:5404 -msgid "Model [none]" -msgstr "Modele [aucune]" +msgstr "Mode[haute puiss]" # -#: ultralcd.cpp:5407 -msgid "Model [warn]" -msgstr "Modele [avert]" - -# -#: ultralcd.cpp:5410 -msgid "Model [strict]" -msgstr "Modele [stricte]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU2 connecte" # MSG_SELFTEST_MOTOR #: messages.c:83 @@ -1283,299 +796,194 @@ msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Deplacer Z" -# -#: ultralcd.cpp:2973 -msgid "N/A" -msgstr "N/A" - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nouvelle version de\nfirmware disponible:" - -# MSG_NO -#: messages.c:62 -msgid "No" -msgstr "Non" - -# -#: -msgid "No " -msgstr "Non" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Pas de checksum avec\nnumero de ligne, \nDerniere ligne :" - # MSG_NO_MOVE -#: Marlin_main.cpp:5254 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6694 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Pas de carte SD" -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "Pas de thermistors\n- pas de temperature" +# +#: ultralcd.cpp:3024 +msgid "N/A" +msgstr "" + +# MSG_NO +#: messages.c:62 +msgid "No" +msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Non connecte" +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nouvelle version de firmware disponible:" + # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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." +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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." -msgstr "Maintenant je vais\nprechauffer la buse\npour du PLA." - -# -#: ultralcd.cpp:4896 -msgid "Now remove the test print from steel sheet." -msgstr "Retirez maintenant l'impression de test de la feuille d'acier." +msgstr "Maintenant je vais prechauffer la buse pour du PLA." # MSG_NOZZLE #: messages.c:63 msgid "Nozzle" msgstr "Buse" -# -#: ultralcd.cpp:5319 -msgid "Nozzle [none]" -msgstr "Buse [aucune]" +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 +#: 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 regles" # -#: 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:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Retirez maintenant l'impression de test de la plaque en acier." # -#: ultralcd.cpp:1787 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" -msgstr "Ventilateur buse" - -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Vent. buse:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Buse2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Buse3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: 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" - -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "ouvrir" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "Echec ouverture, Fichier :" - -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "Echec openRoot" +msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Pause de l'impr." -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Choisir impression" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA :" - # MSG_PAPER c=20 r=8 #: 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:7795 -msgid "Please check :" -msgstr "Verifiez :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: 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." +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:4970 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." -msgstr "Nettoyez le plateau\nchauffant et appuyez\nsur le bouton." +msgstr "Nettoyez la plaque en acier et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 #: messages.c:22 msgid "Please clean the nozzle for calibration. Click when done." -msgstr "Nettoyez la buse\npour la calibration.\nCliquez une fois\nfait." +msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." -# MSG_WIZARD_LOAD_FILAMENT c=20 r=8 -#: 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." +# MSG_SELFTEST_PLEASECHECK +#: ultralcd.cpp:7881 +msgid "Please check :" +msgstr "Verifiez:" -# -#: 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." +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:100 +msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." +msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." -# 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 "Chargez le filament\nPLA et poursuivez\nl'assistant en\nredemarrant\nl'imprimante." +# MSG_WIZARD_LOAD_FILAMENT c=20 r=8 +#: ultralcd.cpp:4894 +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." # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4706 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." -msgstr "Chargez d'abord le\nfilament PLA." +msgstr "Chargez d'abord le filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." -msgstr "Ouvrez l'idler et\nretirez le filament\nmanuellement." +msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 #: messages.c:65 msgid "Please place steel sheet on heatbed." -msgstr "Placez la feuille\nd'acier sur le\nplateau chauffant." +msgstr "Placez la plaque en acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 #: messages.c:68 msgid "Please press the knob to unload filament" -msgstr "Appuyez sur le\nbouton pour \ndecharger le \nfilament" +msgstr "Appuyez sur le bouton pour decharger le filament" + +# +#: ultralcd.cpp:4889 +msgid "Please insert PLA filament to the first tube of MMU, then press the knob to load it." +msgstr "Inserez du PLA dans le 1er tube du MMU, appuyez sur le bouton pour le charger." # MSG_PULL_OUT_FILAMENT c=20 r=4 #: messages.c:70 msgid "Please pull out filament immediately" -msgstr "Retirez\nimmediatement le\nfilament" +msgstr "Retirez immediatement le filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Veuillez retirer le filament puis appuyez sur le bouton." -# -#: 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:74 msgid "Please remove steel sheet from heatbed." -msgstr "Retirez la feuille\nd'acier du plateau\nchauffant." +msgstr "Retirez la plaque en acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: mmu.cpp:1359 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." - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Mettez a jour le FW." +msgstr "Veuillez mettre a jour le firmware de votre MMU2. En attente d'un reset." # MSG_PLEASE_WAIT c=20 #: messages.c:66 @@ -1583,252 +991,127 @@ msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Coupures de courant" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Demarrage" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Prechauffage" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Retirez d'abord les protections de transport." # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Prechauffage" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." -msgstr "Prechauffage de la\nbuse. Merci de\npatienter." - -# -#: 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" +msgstr "Prechauffage de la buse. Merci de patienter." # -#: ultralcd.cpp:2284 -msgid "Preheating to unload" -msgstr "Chauffe pr decharger" - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Preparez le filament" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." -msgstr "Appuyez sur le\nbouton pour\nprechauffer la buse\net continuer." - -# -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "App. sur sur bouton" +msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # -#: 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." +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Coup.de courant" # MSG_PRINT_ABORTED c=20 #: messages.c:69 msgid "Print aborted" msgstr "Impression annulee" -# -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Ventilo impression" +# c=20 r=1 +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Chauffe pour charger" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Vent impr :" +# c=20 r=1 +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventilo impr. :" +msgstr "Vent. impr:" # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" -msgstr "Impr depuis la SD" +msgstr "Impr. depuis la SD" + +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Impression en pause" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Temps d'impression" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Temps d'impression :" - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Imprimante stoppee.\nkill() appelee !" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Appuyez sur le bouton pour rechauffer 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\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." +msgstr "L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration." # -#: 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)" -msgstr "Imprimante arretee a\ncause d'erreurs.\nCorrigez l'erreur et\nutilisez M999 pour\nredemarrer. (La\ntemperature est\nreinitilisee.\nParametrez la apres\nle redemarrage)" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 prete." - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 prete." - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK." +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "Vent. impr" # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" -msgstr "prusa3d.com" +msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Arriere [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recup. impression" -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Rafraichir" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Retour du statut des\nbutees" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Renvoyer" +#: +msgid "Prusa i3 MK3S OK." +msgstr "" -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Renvoi :" +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5774 +msgid "Reset XYZ calibr." +msgstr "Reinit. calib. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 +#: ultralcd.cpp:3296 msgid "Reset" msgstr "Reinitialiser" -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 -msgid "Reset XYZ calibr." -msgstr "Reinit. calibr. XYZ" - # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Reprendre impression" @@ -1837,115 +1120,70 @@ msgstr "Reprendre impression" msgid "Resuming print" msgstr "Reprise de l'impr." -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Droite" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Droite [um]" -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Droite :" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -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:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" -msgstr "Port RPi [on]" +msgstr "Port RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" -msgstr "Port RPi [off]" +msgstr "Port RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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 ?" +msgstr "Lancement de 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Carte SD [normal]" -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "Carte SD ok" - # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "Carte SD [FlashAir]" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" -msgstr "Carte SD [flashAir]" +msgstr "CarteSD [flshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "Echec init SD" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "Octet d'impression de la SD" +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Droite" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 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:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Choisir langue" -# -#: 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:4692 -msgid "Select PLA filament:" -msgstr "Selectionnez le filament PLA :" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" -msgstr "Erreur auto-test !" +msgstr "Erreur auto-test!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 @@ -1953,140 +1191,65 @@ msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: Marlin_main.cpp:1551 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:2138 -msgid "Sensor info" -msgstr "Info capteur" +msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Etat capteur" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # -#: -msgid "Sensors info" -msgstr "Infos capteurs" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "Selectionnez le fil. PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" -msgstr "Regler temp. :" +msgstr "Regler temp.:" # MSG_SETTINGS #: messages.c:86 msgid "Settings" msgstr "Reglages" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -msgstr "Deviation severe" - -# MSG_SEVERE_SKEW c=15 r=1 -#: ultralcd.cpp:2346 -msgid "Severe skew:" -msgstr "Ecart severe :" - -# -#: messages.c:58 -msgid "Sheet" -msgstr "Feuille" - # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Afficher butees" # -#: -msgid "Show pinda state" -msgstr "Etat de la PINDA" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "Repos..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Deviation legere" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Leger ecart :" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=4 #: 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:4833 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Problemes rencontres, nivellement de l'axe Z applique..." +msgstr "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." # MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5230 +#: ultralcd.cpp:5332 msgid "Sort [none]" msgstr "Tri [aucun]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5228 +#: ultralcd.cpp:5330 msgid "Sort [time]" -msgstr "Tri [date]" +msgstr "Tri [heure]" + +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Deviat.sev.:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5229 +#: ultralcd.cpp:5331 msgid "Sort [alphabet]" msgstr "Tri [alphabet]" -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:4250 -msgid "Sort: [None]" -msgstr "Tri : [Aucun]" - -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Tri : [aucun]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Tri : [Heure]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Tri : [heure]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Tri : [Alphabet]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Tri : [alphabet]" - -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Tri : [aucun]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Tri : [heure]" - # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 msgid "Sorting files" @@ -2095,35 +1258,35 @@ msgstr "Tri des fichiers" # MSG_SOUND_LOUD c=17 r=1 #: sound.h:6 msgid "Sound [loud]" -msgstr "Son [fort]" +msgstr "Son [fort]" + +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Deviat.leg.:" # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" -msgstr "Son [muet]" +msgstr "Son [muet]" + +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." # MSG_SOUND_ONCE c=17 r=1 #: 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]" +msgstr "Son [une fois]" # MSG_SOUND_SILENT c=17 r=1 #: sound.h:8 msgid "Sound [silent]" -msgstr "Son [silencieux]" +msgstr "Son [feutre]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Vitesse" @@ -2132,41 +1295,16 @@ msgstr "Vitesse" msgid "Spinning" msgstr "Tourne" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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." +msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2178,12 +1316,12 @@ msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" -msgstr "Support" +msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Echange" @@ -2193,209 +1331,149 @@ msgid "Temp. cal. " msgstr "Calib. Temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" msgstr "Calib. Temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Calib. Temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calibration temp." -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Temperature" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" -msgstr "Echec de la\ncalibration en\ntemperature" - -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -msgid "Temperature calibration has not been run yet" -msgstr "La calibration en\ntemperature n'a pas\nencore ete lancee" +msgstr "Echec de la calibration en temperature" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 #: 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." +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:5650 +msgid "Temperature" +msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" -msgstr "Temperatures" +msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=4 #: messages.c:42 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Il y a encore besoin d'effectuer la calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." - -# -#: ultralcd.cpp:2217 -msgid "to load filament" -msgstr "pour charger le fil." - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "pour decharger fil." - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Total" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Total des echecs" +msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filament total" -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Total filament :" - # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" msgstr "Temps total impr." -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Temps total impr. :" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "ACTIVE" - # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Regler" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "inconnu" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Decharger" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Decharger tout" +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Total des echecs" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "pour charger le fil." + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "pour decharger fil." # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Decharger fil." -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Decharger fil. 1" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Decharger fil. 2" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Decharger fil. 3" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Decharger fil. 4" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Dechargement fil." # -#: 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." +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Tensions" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "Echec volume.init" +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" -msgstr "Attente du\nrefroidissement des\nbuse et plateau" +msgstr "Attente du refroidissement des buse et plateau" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3335 +#: ultralcd.cpp:3422 msgid "Waiting for PINDA probe cooling" -msgstr "Attente du\nrefroidissement de\nla sonde PINDA" +msgstr "Attente du refroidissement de la 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" +# +#: ultralcd.cpp:4868 +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 Remonter le fil. 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:1527 +#: Marlin_main.cpp:1511 msgid "Warning: both printer type and motherboard type changed." -msgstr "Attention : Types\nd'imprimante et de\ncarte mere modifies" +msgstr "Attention: Types d'imprimante et de carte mere modifies" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1519 +#: Marlin_main.cpp:1503 msgid "Warning: motherboard type changed." -msgstr "Attention : Type de\ncarte mere modifie." +msgstr "Attention: Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." -msgstr "Attention : Type\nd'imprimante modifie" - -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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 !" +msgstr "Attention: Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" -msgstr "Dechargement du\nfilament reussi ?" +msgstr "Dechargement du filament reussi?" # MSG_SELFTEST_WIRINGERROR #: messages.c:85 @@ -2403,146 +1481,337 @@ msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Assistant" -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "Echec ouverture workDir" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Ecriture dans le fichier :" - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correction-X" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "Correct-X:" - # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Details calib. XYZ" +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Echec calibration XYZ. Consultez le manuel." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Oui" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:103 +msgid "You can always resume the Wizard from Calibration -> Wizard." +msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." + # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3835 +#: ultralcd.cpp:3922 msgid "XYZ calibration all right. Skew will be corrected automatically." -msgstr "Calibration XYZ OK.\nL'ecart sera corrige\nautomatiquement." +msgstr "Calibration XYZ OK. L'ecart sera corrige automatiquement." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3832 +#: ultralcd.cpp:3919 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 !" +msgstr "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot!" + +# +#: ultralcd.cpp:5130 +msgid "X-correct:" +msgstr "Correct-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." -msgstr "Calibration XYZ\ncompromise. Les\npoints de\ncalibration avant ne\nsont pas\natteignables." - -# 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\ncompromise. Le point\n de calibration\n avant gauche n'est\n pas atteignable." +msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibration XYZ\ncompromise. Le point\nde calibration avant\ndroit n'est pas\natteignable." +msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Charger un par un" # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 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." +msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3801 +#: ultralcd.cpp:3888 msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Echec calibration\nXYZ. Les points de\ncalibration avant ne\nsont pas\natteignables." +msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3687 -msgid "XYZ calibration failed. Left front calibration point not reachable." -msgstr "Echec calibration\nXYZ. Le point de\ncalibration avant\ngauche n'est pas\natteignable." +#: ultralcd.cpp:3891 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Echec calibration\nXYZ. Consultez le\nmanuel." +# +#: ultralcd.cpp:3016 +msgid "Y distance from min" +msgstr "Distance Y du min" # -#: 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." +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Correct-Y:" -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Calibration XYZ OK.\nLes axes X/Y sont\nperpendiculaires.\nFelicitations !" +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [off]" # -#: ultralcd.cpp:2965 -msgid "Y distance from min" -msgstr "Distance Y du min" +#: messages.c:57 +msgid "Back" +msgstr "Retour" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Distance Y du mini :" +# +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Verifications" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correction-Y" +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Faux declenchement" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Correct-Y:" +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "FINDA:" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Oui" +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware [aucune]" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Vous utilisez un\nfirmware en version\nalpha. C'est une\nversion de dev.\nCeci n'est pas\nrecommande et peut\nendommager\nl'imprimante." +# +#: ultralcd.cpp:5551 +msgid "Firmware [strict]" +msgstr "Firmware[stricte]" -# 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 "Vous utilisez un\nfirmware en version\nbeta. C'est une\nversion de dev.\nCeci n'est pas\nrecommande et peut\nendommager\nl'imprimante." +# +#: ultralcd.cpp:5548 +msgid "Firmware [warn]" +msgstr "Firmware [avert]" -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:103 -msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours\nrelancer l'assistant\ndans Calibration->\nAssistant." +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Config HW" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "IR:" + +# +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Compens. aim.[N/A]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Compens. aim.[off]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Compens. aim. [on]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detecte sur imprimante MK3" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "Mode MMU [normal]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "Mode MMU [feutre]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Changement de mode en cours..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Modele [aucune]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Modele [stricte]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Modele [avert]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Diam. buse [0.25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Diam. buse [0.40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Diam. buse [0.60]" + +# +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Buse [aucune]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Buse [stricte]" # -#: ultralcd.cpp:5030 +#: ultralcd.cpp:5424 +msgid "Nozzle [warn]" +msgstr "Buse [avert]" + +# +#: 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 "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." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "PINDA:" + +# c=20 r=1 +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Chauffe pour couper" + +# c=20 r=1 +#: ultralcd.cpp:2462 +msgid "Preheating to eject" +msgstr "Chauf. pour remonter" + +# +#: util.cpp:390 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le 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 dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# +#: ultralcd.cpp:6683 +msgid "Rename" +msgstr "Renommer" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Selectionner" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Info capteur" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plaque" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Son [assist]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Plaques en acier" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Correct-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "Sonde-Z num. [1]" +msgstr "Mesurer x-fois [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" -msgstr "Sonde-Z num. [3]" +msgstr "Mesurer x-fois [3]" + +# +#: ultralcd.cpp:7039 +msgid "Z-probe nr. [5]" +msgstr "Mesurer x-fois [5]" -# MSG_MEASURED_OFFSET -#: 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 c226463bfb..8cec0ce683 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into Italian. +# msgid "" msgstr "" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -msgstr "\e[2JRilev. impatto\e[1;0Hattivabile solo\e[2;0Hin Modalita normale" - -# 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[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: " -msgstr " PlannerBufferBytes: " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr " [off" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr "evitata estrusione fredda" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr "Memoria Libera: " - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr "Ultimo aggiornamento: " +"Language: it\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:33:15 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:33:15 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,48 +25,33 @@ msgstr " su 4" msgid " of 9" msgstr "su 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr " [off]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Fattore" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "[0;0] punto offset" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Rilev. impatto\x0aattivabile solo\x0ain Modalita normale" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Annulla" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Compensazione Z" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 msgid "Adjusting Z:" -msgstr "Compensazione Z:" - -# MSG_ALL c=19 r=1 -#: messages.c:11 -msgid "All" -msgstr "Tutti" +msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Nessun errore" @@ -108,39 +61,34 @@ msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Ambiente" # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Autoregolare Z?" - # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "Esaurimento automatico [on]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "Auto svuotamento[N/A]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "Esaurimento automatico [off]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "" # MSG_AUTO_HOME #: messages.c:11 @@ -148,52 +96,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 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:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Assi" +msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Lunghezza dell'asse" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Babystepping X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -msgid "Babystepping Y" -msgstr "Babystepping Y" - -# -#: messages.c:57 -msgid "Back" -msgstr "Indietro" - -# MSG_BED -#: messages.c:15 -msgid "Bed" -msgstr "Letto" +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Letto/Riscald." @@ -208,7 +136,7 @@ msgid "Bed Heating" msgstr "Riscald. letto" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" msgstr "Correz. liv.letto" @@ -217,43 +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_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Inizio lista file" +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Letto" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" -msgstr "Stato delle cinghie" +msgstr "Stato cinghie" # MSG_RECOVER_PRINT c=20 r=2 #: 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:4566 -msgid "Calibrate" -msgstr "Calibra" - -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Calibra E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -262,13 +175,13 @@ msgstr "Calibra XYZ" msgid "Calibrate Z" msgstr "Calibra Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Calibrazione Home" +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." @@ -278,132 +191,32 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:816 +msgid "Calibration done" +msgstr "Calibrazione completa" + # MSG_MENU_CALIBRATION #: messages.c:61 msgid "Calibration" msgstr "Calibrazione" -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 -msgid "Calibration done" -msgstr "Calibrazione completa" - # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Annulla" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Impossibile accedere alla sottocartella: " - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "Impossibile aprire la subdir" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "SD inserita" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "SD rimossa" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Cambio estrusore" - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Cambia filamento" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Cambia memoria SD" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Cambio riuscito!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Cambiato correttamente?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Cambiando filam." - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Verifica piano" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Verifica finecorsa" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Verifica ugello" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Controllo sensori" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Verifica asse X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Verifica asse Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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: " -msgstr "mancata corrispondenza di checksum, ultima riga:" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Seleziona estrusore:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Scegliere filamento:" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Colore non puro" @@ -413,34 +226,24 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Copiare la lingua selezionata da XFLASH?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Impatto" - # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" -msgstr "Rilevam.imp. [on]" +msgstr "Rileva.crash [on]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Rilevam.imp.[N/A]" +msgstr "Rileva.crash[N/A]" # MSG_CRASHDETECT_OFF #: messages.c:26 msgid "Crash det. [off]" -msgstr "Rilevam.imp.[off]" +msgstr "Rileva.crash[off]" # MSG_CRASH_DETECTED c=20 r=1 #: messages.c:24 @@ -448,27 +251,27 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 msgid "Disable steppers" msgstr "Disabilita motori" @@ -478,124 +281,69 @@ 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:4968 +#: ultralcd.cpp:5070 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_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "Calibrazione E terminata. Si prega di pulire l'ugello. Click per continuare." - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Correzione-E" - # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Correzione-E:" -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Espellere" - # MSG_EJECT_FILAMENT c=17 r=1 #: 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:4869 +msgid "Eject" +msgstr "Espellere" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Espellendo filamento " -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Fine lista file" +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +#: ultralcd.cpp:7917 +msgid "Endstop not hit" +msgstr "Finecorsa fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Finecorsa" -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 -msgid "Endstop not hit" -msgstr "Finecorsa fuori portata" - # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Finecorsa" -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "finecorsa colpito: " - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Italiano" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "accodamento\"" - # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e stata sovrascritta" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "errore scrittura sul file" +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "ERRORE:" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4388 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8304 +msgid "Extruder fan:" +msgstr "Ventola estr:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Flash SPI W25X20CL esterno non risponde." +# MSG_INFO_EXTRUDER c=15 r=1 +#: ultralcd.cpp:2244 +msgid "Extruder info" +msgstr "Info estrusore" # MSG_MOVE_E #: messages.c:29 @@ -603,39 +351,14 @@ msgid "Extruder" msgstr "Estrusore" # -#: 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:8218 -msgid "Extruder fan:" -msgstr "Ventola estrusore:" - -# MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 -msgid "Extruder info" -msgstr "Info estrusore" +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "Stat.fall. MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "Autocar.filam[on]" +msgstr "Autocar.fil. [on]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -643,29 +366,19 @@ msgid "F. autoload [N/A]" msgstr "Autocar.fil.[N/A]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autocar.fil.[off]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" -msgstr "Statistiche fallimenti" - -# -#: ultralcd.cpp:6760 -msgid "Fail stats MMU" -msgstr "Statistiche fallimenti MMU" - -# -#: ultralcd.cpp:7887 -msgid "False triggering" -msgstr "Falso innesco" +msgstr "Stat. fallimenti" # MSG_FAN_SPEED c=14 #: messages.c:31 msgid "Fan speed" -msgstr "Velocita ventola" +msgstr "Velocita vent." # MSG_SELFTEST_FAN c=20 #: messages.c:78 @@ -673,52 +386,42 @@ msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" -msgstr "Control.vent[on]" +msgstr "Control.vent [on]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Control.vent[off]" # MSG_FSENSOR_ON #: messages.c:45 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? " +msgstr "Sensore fil. [on]" # MSG_FSENSOR_NA -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" -msgstr "Sensor filam[N/A]" +msgstr "Sensore fil.[N/A]" # MSG_FSENSOR_OFF #: messages.c:44 msgid "Fil. sensor [off]" -msgstr "Sensor filam[off]" +msgstr "Sensore fil.[off]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Filam. esauriti" -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filamento" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" msgstr "Filamento estruso & con il giusto colore?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. non caricato" @@ -727,68 +430,33 @@ msgstr "Fil. non caricato" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Filamento utilizzato" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Filamento usato:" +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Tempo di stampa" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "File aperto: " - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -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 #: messages.c:105 msgid "First layer cal." -msgstr "Calibrazione primo layer." +msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 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." @@ -798,14 +466,14 @@ 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:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 @@ -813,57 +481,22 @@ msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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:7801 -msgid "Heater/Thermistor" -msgstr "Riscald./Termist." - -# MSG_HEATING -#: messages.c:46 -msgid "Heating" -msgstr "Riscaldamento..." +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:7887 +msgid "Heater/Thermistor" +msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 +#: Marlin_main.cpp:8467 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -872,98 +505,128 @@ msgstr "Riscaldamento fermato dal timer di sicurezza." msgid "Heating done." msgstr "Riscald. completo" +# MSG_HEATING +#: messages.c:46 +msgid "Heating" +msgstr "Riscaldamento..." + # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "Installazione HW" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Cambia filamento" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Cambio riuscito!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Cambiato correttamente?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Verifica piano" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Verifica finecorsa" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Verifica ugello" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Controllo sensori" + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Verifica asse X" + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Verifica asse Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Verifica asse Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Seleziona estrusore:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Scegliere filamento:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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:4897 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4962 +#: ultralcd.cpp:5064 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:99 msgid "Info screen" msgstr "Schermata info" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Inizializza scheda SD" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "Il filamento 1 e caricato?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Inserire filamento" -# 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: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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Il filamento e stato caricato?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "E' un filamento di PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "E' stato caricato il filamento di PLA?" @@ -972,98 +635,48 @@ msgstr "E' stato caricato il filamento di PLA?" 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" - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "IN TILT." - -# -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Ultima stampa" - # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Sinistra" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Ultima stampa" # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Vent SX hotend?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Sinistra" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" -msgstr "Sinistra [um]" - -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Sinistra:" +msgstr "Sinistra [um]" # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" -msgstr "Correzione lin." +msgstr "Correzione lineare" # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" msgstr "Compensazione Z" -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Caricare tutti" - # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Carica filamento" -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Caricare fil. 1" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Caricare fil. 2" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Carica fil. 3" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Caricare fil. 4" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Caricare fil. 5" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "Carica ugello" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Caricando colore" @@ -1073,219 +686,109 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Puleggia lenta" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 Estrusore non valido" - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 Estrusore non valido" - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 Estrusore non valido" +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "Carica ugello" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Calibrazione primo layer." -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 Estrusore non valido" - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 Estrusore non valido" - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" msgstr "Menu principale" -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -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:3002 -msgid "Measured skew" -msgstr "Deviazione misurata" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Distorsione misurata:" - # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" -msgstr "Mesh livel. letto" +msgstr "Livel. piatto" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Mesh livel. letto" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. riprendendo la posizione... " -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Rilevato firmware MK3 su stampante MK3S" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Ripristino temperatura... " # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S rilevato su stampante MK3" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Deviazione mis" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Fallimenti MMU" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" -# -#: 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." - -# 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 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:762 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. riprendendo la posizione... " - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Ripristino temperatura... " - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "Mancanza corrente MMU" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU2 connessa" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" -msgstr "Modo [normale]" +msgstr "Mod. [normale]" # MSG_SILENT_MODE_ON #: messages.c:89 msgid "Mode [silent]" -msgstr "Modo [silenzioso]" +msgstr "Mod. [silenziosa]" + +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "Il MMU richiede attenzione dall'utente." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "Manc. corr. MMU" # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Modo [Silenziosa]" - -# -#: ultralcd.cpp:4424 -msgid "Mode change in progress ..." -msgstr "Cambio modalità in corso ..." +msgstr "Mod. [silenziosa]" # MSG_AUTO_MODE_ON #: messages.c:12 msgid "Mode [auto power]" -msgstr "Modo [auto]" +msgstr "Mod. [auto]" # MSG_SILENT_MODE_OFF #: 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]" +msgstr "Mod. [forte]" # -#: ultralcd.cpp:5410 -msgid "Model [strict]" -msgstr "Modello [esatto]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU2 connessa" # MSG_SELFTEST_MOTOR #: messages.c:83 @@ -1293,222 +796,122 @@ msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Sposta Z" -# -#: ultralcd.cpp:2973 -msgid "N/A" -msgstr "N/A" - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nuova versione firmware disponibile:" - -# MSG_NO -#: messages.c:62 -msgid "No" -msgstr "No" - -# -#: -msgid "No " -msgstr "No" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Nessun checksum con numero di riga, ultima riga:" - # MSG_NO_MOVE -#: Marlin_main.cpp:5254 +#: Marlin_main.cpp:5292 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6694 +#: ultralcd.cpp:6772 msgid "No SD card" msgstr "Nessuna SD" -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "No termistore - no temperatura" +# +#: ultralcd.cpp:3024 +msgid "N/A" +msgstr "" + +# MSG_NO +#: messages.c:62 +msgid "No" +msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Non connesso" +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nuova versione firmware disponibile:" + # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." -# -#: 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:63 msgid "Nozzle" msgstr "Ugello" -# -#: 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]" +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 +#: Marlin_main.cpp:1519 +msgid "Old settings found. Default PID, Esteps etc. will be set." +msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:5371 -msgid "Nozzle d. [0.60]" -msgstr "Diam. Ugello [0.60]" +#: ultralcd.cpp:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1787 +#: ultralcd.cpp:1722 msgid "Nozzle FAN" msgstr "Ventola estrusore" -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Ventola dell'ugello:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Ugello2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Nozzle3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1535 -msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." - -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "apri" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "apertura fallita, File: " - -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "openRoot fallito" - # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Metti in pausa" -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Scegli stampa" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA:" - # MSG_PAPER c=20 r=8 #: 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:7795 -msgid "Please check :" -msgstr "Verifica:" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: 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:4970 +#: ultralcd.cpp:5072 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -1517,28 +920,28 @@ msgstr "Per favore pulisci il piatto, poi premi la manopola." 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:7881 +msgid "Please check :" +msgstr "Verifica:" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: 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:4804 +#: ultralcd.cpp:4894 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: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." - -# 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 "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:4706 +#: ultralcd.cpp:4795 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:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" @@ -1552,110 +955,75 @@ msgstr "Per favore posizionate la piastra d'acciaio sul piano riscaldato." msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento " +# +#: ultralcd.cpp:4889 +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:70 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Rimuovi il filamento e quindi premi la manopola. " -# -#: 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: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:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prego aggiornare." - # MSG_PLEASE_WAIT c=20 #: messages.c:66 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Mancanza corrente" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Accendi" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Preriscalda" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Per favore rimuovete i materiali da spedizione" # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Preriscalda" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." # -#: 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:2284 -msgid "Preheating to unload" -msgstr "Preriscaldamento per scaricare" - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Preparare il nuovo filamento" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "Premere la manopola" - -# -#: mmu.cpp:723 -msgid "Press the knob to resume nozzle temperature." -msgstr "Premete la manopola per recuperare la temperatura dell'ugello." +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Mancanza corrente" # MSG_PRINT_ABORTED c=20 #: messages.c:69 @@ -1663,69 +1031,39 @@ msgid "Print aborted" msgstr "Stampa interrotta" # -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Ventola di stampa" +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Preriscaldamento per caricare" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Ventola di stampa:" +# +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Preriscaldamento per scaricare" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Ventola di stampa:" +msgstr "Vent.stam:" # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" msgstr "Stampa da SD" +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "Premere la manopola" + # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Stampa in pausa" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Tempo di stampa" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Tempo di stampa:" - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Stampante ferma. kill () chiamato!" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Premete la manopola per recuperare la temperatura dell'ugello." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 #: messages.c:41 @@ -1733,112 +1071,47 @@ 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." # -#: 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)" -msgstr "La stampante si è fermata a causa di errori. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)" - -# -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 pronta." - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 pronta." - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK." +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "Ventola di stampa" # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" -msgstr "prusa3d.com" +msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Retro [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Recupero stampa" -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Refresh" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Segnalazione dello stato finecorsa" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Ripeti" - -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Invia di nuovo: " - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 -msgid "Reset" -msgstr "Reset" +#: +msgid "Prusa i3 MK3S OK." +msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." +# MSG_BED_CORRECTION_RESET +#: ultralcd.cpp:3296 +msgid "Reset" +msgstr "" + # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Riprendi stampa" @@ -1847,113 +1120,68 @@ msgstr "Riprendi stampa" msgid "Resuming print" msgstr "Riprendi stampa" -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Destra" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Destra [um]" -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Destra:" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -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:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Porta RPi [on]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Porta RPi [off]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Mem. SD [normale]" -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "Memoria SD ok" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "Mem. SD [FlashAir]" - # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Mem. SD [flshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "Inizializzazione Memoria SD Fallita" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "SD stampa byte " +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Destra" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 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:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Seleziona lingua" -# -#: 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:4692 -msgid "Select PLA filament:" -msgstr "Selezionate filamento PLA:" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Autotest" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" msgstr "Errore Autotest !" @@ -1963,27 +1191,22 @@ msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: 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:2138 -msgid "Sensor info" -msgstr "Info Sensore" - -# -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Stato sensore" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # -#: -msgid "Sensors info" -msgstr "Info Sensori" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "Selezionate filamento PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" msgstr "Imposta temperatura:" @@ -1992,110 +1215,40 @@ msgstr "Imposta temperatura:" msgid "Settings" msgstr "Impostazioni" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -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:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Stato finecorsa" # -#: -msgid "Show pinda state" -msgstr "Mostra stato pinda" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "Sospensione..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Deviazione lieve" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Distorsione leggera:" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=4 #: 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: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 +#: ultralcd.cpp:5332 msgid "Sort [none]" -msgstr "Ordina [nessuno]" +msgstr "Ordina [nessuno]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5228 +#: ultralcd.cpp:5330 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]" -msgstr "Ordine: [Nessuno]" +msgstr "Ordina [cron.]" -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Ordina: [none]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Ordine: [Tempo]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Ordina: [time]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Ordine: [Alfabetico]" +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Devia.grave:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Ordine: [alfabet]" - -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Ordine: [nessuno]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Ordina: [time]" +#: ultralcd.cpp:5331 +msgid "Sort [alphabet]" +msgstr "Ordine [alfabeti]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -2107,33 +1260,33 @@ msgstr "Ordinando i file" msgid "Sound [loud]" msgstr "Suono [forte]" +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Devia.lieve:" + # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" msgstr "Suono [mute]" +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." + # MSG_SOUND_ONCE c=17 r=1 #: 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:8 msgid "Sound [silent]" msgstr "Suono[silenzioso]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Velocita" @@ -2142,41 +1295,16 @@ msgstr "Velocita" msgid "Spinning" msgstr "Gira" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [on]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [N/A]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [off]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2188,12 +1316,12 @@ msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Scambiato" @@ -2203,42 +1331,37 @@ msgid "Temp. cal. " msgstr "Calib. temp. " # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Calib. temp. [ON]" +msgstr "Calib. temp. [on]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" -msgstr "Calib. temp.[OFF]" +msgstr "Calib. temp.[off]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Calib. Temp." -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Temperatura" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -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: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:5650 +msgid "Temperature" +msgstr "" + # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperature" @@ -2248,162 +1371,107 @@ 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:2217 -msgid "to load filament" -msgstr "per caricare il filamento" - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "per scaricare il filamento" - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Totale" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Totale fallimenti" - -# -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" msgstr "Filamento totale" -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Filamento tot:" - # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" -msgstr "Tempo di stampa totale" - -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Tempo stampa tot:" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "ATTIVATO" +msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Regola" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "sconosciuto" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Scarica" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rilasciare tutti" +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Totale fallimenti" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "per caricare il filamento" + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Scarica filamento" -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Rilasciare fil. 1" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Scarica filam. 2" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Scarica filam. 3" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Scarica filam. 4" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: 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." +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Voltaggi" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "volume.init fallito" +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 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:3335 +#: ultralcd.cpp:3422 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" +# +#: ultralcd.cpp:4868 +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:1527 +#: 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:1519 +#: 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:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" @@ -2413,146 +1481,332 @@ msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" -msgstr "Wizard" - -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "workDir open fallito" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Scrittura su file: " - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Correzione-X" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "Correzione-X:" +msgstr "" # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Si" + +# MSG_WIZARD_QUIT c=20 r=8 +#: 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:3835 +#: ultralcd.cpp:3922 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:3832 +#: ultralcd.cpp:3919 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:5130 +msgid "X-correct:" +msgstr "Correzione-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." -# 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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Caricare tutti" + # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 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:3801 +#: ultralcd.cpp:3888 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_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." - -# -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3891 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:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" - # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Distanza Y dal min" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Distanza Y da min:" +# +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Correzione-Y:" + +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr "" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Correzione-Y" +#: messages.c:57 +msgid "Back" +msgstr "Indietro" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Correzione-Y:" +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Controlli" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Si" +# +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Falso innesco" + +# +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "State utilizzando una versione alpha del firmware. Questa versione è in via di sviluppo. L'utilizzo non è raccomandato e potrebbe causare danni alla stampante." +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware[nessuno]" -# 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 "State utilizzando una versione beta del firmware. Questa versione è in via di sviluppo. L'utilizzo non è raccomandato e potrebbe causare danni alla stampante." +# +#: ultralcd.cpp:5551 +msgid "Firmware [strict]" +msgstr "Firmware [esatto]" -# MSG_WIZARD_QUIT c=20 r=8 -#: 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:5548 +msgid "Firmware [warn]" +msgstr "Firmware [avviso]" + +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Installazione HW" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Comp. Magneti[N/A]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Comp. Magneti[off]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Comp. Magneti [on]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "Griglia [3x3]" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "Griglia [7x7]" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "Mesh livel. letto" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S rilevato su stampante MK3" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "Modalita MMU [Normale]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "Modalita MMU [Silenziosa]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Cambio modalita in corso ..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Modello [nessuno]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Modello [esatto]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Modello [avviso]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Diam.Ugello[0.25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Diam.Ugello[0.40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Diam.Ugello[0.60]" # -#: ultralcd.cpp:5030 +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Ugello [nessuno]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Ugello [esatto]" + +# +#: ultralcd.cpp:5424 +msgid "Nozzle [warn]" +msgstr "Ugello [avviso]" + +# +#: 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 piu 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 piu recente. Per favore aggiorna il firmware. Stampa annullata." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Preriscaldamento per taglio" + +# +#: ultralcd.cpp:2462 +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:6683 +msgid "Rename" +msgstr "Rinomina" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Seleziona" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Info Sensore" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Piano" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Suono [assist.]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Piani d'acciaio" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Correzione-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "Z-probe nr. [1]" +msgstr "Z-probe nr. [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" -msgstr "Z-probe nr. [3]" +msgstr "Z-probe nr. [3]" -# MSG_MEASURED_OFFSET -#: 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 e30df0e07e..0557683822 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -1,51 +1,19 @@ +# Translation of Prusa-Firmware into Polish. +# msgid "" msgstr "" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n%10 >= 2 && n%10 <=4 && (n%100 < 12 || n%100 > 14)) ? 1 : ((n%10 == 0 || n%10 == 1 || (n%10 >= 5 && n%10 <=9)) || (n%100 >= 12 && n%100 <= 14)) ? 2 : 3);\n" -"X-Generator: PhraseApp (phraseapp.com)\n" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ultralcd.cpp:4219 -msgid "\e[2JCrash detection can\e[1;0Hbe turned on only in\e[2;0HNormal mode" -msgstr "\e[2JWykrywanie zderzen moze\e[1;0Hbyc wlaczone tylko w\e[2;0Htrybie Normalnym" - -# 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[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: " -msgstr " PlannerBufferBytes: " - -# MSG_EXTRUDER_CORRECTION_OFF c=6 -#: ultralcd.cpp:6312 -msgid " [off" -msgstr "[wyl" - -# MSG_ERR_COLD_EXTRUDE_STOP -#: planner.cpp:761 -msgid " cold extrusion prevented" -msgstr " nie dopuszczono do zimnej ekstruzji" - -# MSG_FREE_MEMORY -#: Marlin_main.cpp:1182 -msgid " Free Memory: " -msgstr " Wolna pamiec:" - -# MSG_CONFIGURATION_VER -#: Marlin_main.cpp:1172 -msgid " Last Updated: " -msgstr "Ostatnia aktualizacja: " +"Language: pl\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Sun, Sep 22, 2019 1:34:25 PM\n" +"PO-Revision-Date: Sun, Sep 22, 2019 1:34:25 PM\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:39 @@ -57,48 +25,33 @@ msgstr " z 4" msgid " of 9" msgstr " z 9" -# MSG_OFF -#: menu.cpp:426 -msgid " [off]" -msgstr "[wyl]" - -# MSG_FACTOR -#: ultralcd.cpp:6008 -msgid " \002 Fact" -msgstr " \002 Fact" +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:3089 +msgid "[0;0] point offset" +msgstr "[0;0] przesun.punktu" -# MSG_MAX -#: ultralcd.cpp:6007 -msgid " \002 Max" -msgstr " \002 Max" +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +msgid "Crash detection can\x0abe turned on only in\x0aNormal mode" +msgstr "Wykrywanie zderzen\x0amoze byc wlaczone\x0atylko w\x0atrybie Normalnym" -# MSG_MIN -#: ultralcd.cpp:6006 -msgid " \002 Min" -msgstr " \002 Min" +# MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2294 +#: ultralcd.cpp:2472 msgid ">Cancel" msgstr ">Anuluj" -# MSG_BABYSTEPPING_Z c=20 -#: ultralcd.cpp:3043 -msgid "Adjusting Z" -msgstr "Dostrajanie Z" - # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3144 +#: ultralcd.cpp:3209 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:8209 +#: ultralcd.cpp:8295 msgid "All correct " msgstr "Wszystko OK " @@ -108,39 +61,34 @@ msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:1979 +#: ultralcd.cpp:2009 msgid "Ambient" msgstr "Otoczenie" # MSG_PRESS c=20 -#: ultralcd.cpp:2573 +#: ultralcd.cpp:2618 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3442 +#: ultralcd.cpp:3529 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" -# MSG_ADJUSTZ -#: ultralcd.cpp:2600 -msgid "Auto adjust Z?" -msgstr "Autodostroic Z?" - # MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:4706 -msgid "Auto deplete [on]" -msgstr "SpoolJoin [wl]" +#: ultralcd.cpp:5200 +msgid "SpoolJoin [on]" +msgstr "SpoolJoin [wl]" # -#: ultralcd.cpp:4702 -msgid "Auto deplete[N/A]" -msgstr "SpoolJoin [nd]" +#: ultralcd.cpp:5196 +msgid "SpoolJoin [N/A]" +msgstr "SpoolJoin [N/D]" # MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:4710 -msgid "Auto deplete[off]" -msgstr "SpoolJoin [wyl]" +#: ultralcd.cpp:5204 +msgid "SpoolJoin [off]" +msgstr "SpoolJoin [wyl]" # MSG_AUTO_HOME #: messages.c:11 @@ -148,52 +96,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=17 -#: ultralcd.cpp:6731 +#: ultralcd.cpp:6822 msgid "AutoLoad filament" -msgstr "AutoLadowanie fil." +msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4375 +#: ultralcd.cpp:4462 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:2768 +#: ultralcd.cpp:2813 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:7865 -msgid "Axis" -msgstr "Os" - # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:7863 +#: ultralcd.cpp:7949 msgid "Axis length" msgstr "Dlugosc osi" -# MSG_BABYSTEPPING_X -#: ultralcd.cpp:2481 -msgid "Babystepping X" -msgstr "Babystepping X" - -# MSG_BABYSTEPPING_Y -#: ultralcd.cpp:2484 -msgid "Babystepping Y" -msgstr "Babystepping Y" - -# -#: messages.c:57 -msgid "Back" -msgstr "Wstecz" - -# MSG_BED -#: messages.c:15 -msgid "Bed" -msgstr "Stol" +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:7951 +msgid "Axis" +msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:7807 +#: ultralcd.cpp:7893 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -208,32 +136,22 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5663 +#: ultralcd.cpp:5768 msgid "Bed level correct" -msgstr "Korekta poziomowania stolu" +msgstr "Korekta stolu" # 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 "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_BEGIN_FILE_LIST -#: Marlin_main.cpp:4405 -msgid "Begin file list" -msgstr "Poczatek listy plikowogranicznikow" +# MSG_BED +#: messages.c:15 +msgid "Bed" +msgstr "Stol" # MSG_MENU_BELT_STATUS c=15 r=1 -#: ultralcd.cpp:2007 +#: ultralcd.cpp:2059 msgid "Belt status" msgstr "Stan paskow" @@ -242,18 +160,13 @@ msgstr "Stan paskow" msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4566 -msgid "Calibrate" -msgstr "Kalibruj" - -# MSG_CALIBRATE_E c=20 r=1 -#: ultralcd.cpp:4526 -msgid "Calibrate E" -msgstr "Kalibruj E" +# +#: ultralcd.cpp:8297 +msgid "Calibrating home" +msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5757 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -262,13 +175,13 @@ msgstr "Kalibracja XYZ" msgid "Calibrate Z" msgstr "Kalibruj Z" -# -#: ultralcd.cpp:8211 -msgid "Calibrating home" -msgstr "Zerowanie osi" +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4654 +msgid "Calibrate" +msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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." @@ -278,132 +191,32 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3405 +#: ultralcd.cpp:3492 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:816 +msgid "Calibration done" +msgstr "Kalibracja OK" + # MSG_MENU_CALIBRATION #: messages.c:61 msgid "Calibration" msgstr "Kalibracja" -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:832 -msgid "Calibration done" -msgstr "Kalibracja OK" - # -#: ultralcd.cpp:4692 +#: ultralcd.cpp:4781 msgid "Cancel" msgstr "Anuluj" -# MSG_SD_CANT_ENTER_SUBDIR -#: cardreader.cpp:662 -msgid "Cannot enter subdir: " -msgstr "Brak dostepu do subdir: " - -# MSG_SD_CANT_OPEN_SUBDIR -#: cardreader.cpp:97 -msgid "Cannot open subdir" -msgstr "Nie moge otworzyc subdir" - -# MSG_SD_INSERTED -#: -msgid "Card inserted" -msgstr "Karta wlozona" - # MSG_SD_REMOVED -#: ultralcd.cpp:8578 +#: ultralcd.cpp:8679 msgid "Card removed" msgstr "Karta wyjeta" -# -#: ultralcd.cpp:6087 -msgid "Change extruder" -msgstr "Zmiana ekstrudera" - -# MSG_FILAMENTCHANGE -#: messages.c:37 -msgid "Change filament" -msgstr "Wymiana filamentu" - -# MSG_CNG_SDCARD -#: ultralcd.cpp:5777 -msgid "Change SD card" -msgstr "Wymien karte SD" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2584 -msgid "Change success!" -msgstr "Wymiana ok!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2661 -msgid "Changed correctly?" -msgstr "Wymiana ok?" - -# MSG_CHANGING_FILAMENT c=20 -#: ultralcd.cpp:1899 -msgid "Changing filament!" -msgstr "Wymiana filamentu!" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:81 -msgid "Checking bed " -msgstr "Kontrola stolu" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8200 -msgid "Checking endstops" -msgstr "Kontrola krancowek" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8206 -msgid "Checking hotend " -msgstr "Kontrola hotendu" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:82 -msgid "Checking sensors " -msgstr "Sprawdzanie czujnikow" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:8201 -msgid "Checking X axis " -msgstr "Kontrola osi X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:8202 -msgid "Checking Y axis " -msgstr "Kontrola osi Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: 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: " -msgstr "suma kontrolna niezgodna, ostatnia linia:" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:49 -msgid "Choose extruder:" -msgstr "Wybierz ekstruder:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:50 -msgid "Choose filament:" -msgstr "Wybierz filament:" - # MSG_NOT_COLOR -#: ultralcd.cpp:2673 +#: ultralcd.cpp:2718 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -413,20 +226,10 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4108 -msgid "Copy selected language from XFLASH?" -msgstr "Skopiowac wybrany jezyk z XFLASH?" - -# -#: ultralcd.cpp:4499 +#: ultralcd.cpp:4587 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" -# -#: ultralcd.cpp:1881 -msgid "Crash" -msgstr "Zderzenie" - # MSG_CRASHDETECT_ON #: messages.c:27 msgid "Crash det. [on]" @@ -435,7 +238,7 @@ msgstr "Wykr.zderzen [wl]" # MSG_CRASHDETECT_NA #: messages.c:25 msgid "Crash det. [N/A]" -msgstr "Wykr.zderzen[n/d]" +msgstr "Wykr.zderzen[N/D]" # MSG_CRASHDETECT_OFF #: messages.c:26 @@ -448,29 +251,29 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:618 +#: Marlin_main.cpp:600 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" +# +#: ultralcd.cpp:1853 +msgid "Crash" +msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5804 +#: ultralcd.cpp:5909 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2106 +#: ultralcd.cpp:2213 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5552 +#: ultralcd.cpp:5654 msgid "Disable steppers" -msgstr "Wylaczenie silnikow" +msgstr "Wylacz silniki" # MSG_BABYSTEP_Z_NOT_SET c=20 r=12 #: messages.c:14 @@ -478,124 +281,69 @@ 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:4968 +#: ultralcd.cpp:5070 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_CLEAN_NOZZLE_E c=20 r=8 -#: ultralcd.cpp:3890 -msgid "E calibration finished. Please clean the nozzle. Click when done." -msgstr "Kalibracja E zakonczona. Oczysc dysze i potwierdz naciskajac pokretlo. " - -# MSG_EXTRUDER_CORRECTION c=9 -#: ultralcd.cpp:4889 -msgid "E-correct" -msgstr "Korekcja E" - # MSG_EXTRUDER_CORRECTION c=10 -#: ultralcd.cpp:5032 +#: ultralcd.cpp:5134 msgid "E-correct:" msgstr "Korekcja-E:" -# -#: ultralcd.cpp:4780 -msgid "Eject" -msgstr "Wysun" - # MSG_EJECT_FILAMENT c=17 r=1 #: 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:4869 +msgid "Eject" +msgstr "Wysun" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1435 +#: mmu.cpp:1434 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" -# MSG_END_FILE_LIST -#: Marlin_main.cpp:4407 -msgid "End file list" -msgstr "Koniec listy plikow" +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +#: ultralcd.cpp:7917 +msgid "Endstop not hit" +msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:7825 +#: ultralcd.cpp:7911 msgid "Endstop" msgstr "Krancowka" -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 -#: ultralcd.cpp:7831 -msgid "Endstop not hit" -msgstr "Krancowka nie aktyw." - # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:7813 +#: ultralcd.cpp:7899 msgid "Endstops" msgstr "Krancowki" -# MSG_ENDSTOPS_HIT -#: messages.c:30 -msgid "endstops hit: " -msgstr "krancowki aktywowane:" - -# MSG_LANGUAGE_NAME -#: language.c:153 -msgid "English" -msgstr "Angielski" - -# MSG_Enqueing -#: -msgid "enqueing \"" -msgstr "kolejkowanie \"" - # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6773 +#: ultralcd.cpp:6859 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" -# MSG_SD_ERR_WRITE_TO_FILE -#: messages.c:78 -msgid "error writing to file" -msgstr "blad zapisywania pliku" +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4475 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." # MSG_ERROR #: messages.c:28 msgid "ERROR:" msgstr "BLAD:" -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4388 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8304 +msgid "Extruder fan:" +msgstr "WentHotend:" -# -#: Marlin_main.cpp:1006 -msgid "External SPI flash W25X20CL not responding." -msgstr "Zewnetrzna pamiec flash SPI W25X20CL nie odpowiada." +# MSG_INFO_EXTRUDER c=15 r=1 +#: ultralcd.cpp:2244 +msgid "Extruder info" +msgstr "Ekstruder - info" # MSG_MOVE_E #: messages.c:29 @@ -603,39 +351,14 @@ msgid "Extruder" msgstr "Ekstruder" # -#: 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:8218 -msgid "Extruder fan:" -msgstr "Went. ekstrudera:" - -# MSG_INFO_EXTRUDER c=15 r=1 -#: ultralcd.cpp:2137 -msgid "Extruder info" -msgstr "Informacje o ekstruderze" +#: ultralcd.cpp:6846 +msgid "Fail stats MMU" +msgstr "Bledy MMU" # MSG_FSENS_AUTOLOAD_ON c=17 r=1 -#: ultralcd.cpp:5066 +#: ultralcd.cpp:5168 msgid "F. autoload [on]" -msgstr "Autolad. fil [wl]" +msgstr "Autolad.fil. [wl]" # MSG_FSENS_AUTOLOAD_NA c=17 r=1 #: messages.c:43 @@ -643,25 +366,15 @@ msgid "F. autoload [N/A]" msgstr "Autolad.fil.[N/D]" # MSG_FSENS_AUTOLOAD_OFF c=17 r=1 -#: ultralcd.cpp:5068 +#: ultralcd.cpp:5170 msgid "F. autoload [off]" msgstr "Autolad.fil.[wyl]" # -#: ultralcd.cpp:6757 +#: ultralcd.cpp:6843 msgid "Fail stats" msgstr "Statystyki bledow" -# -#: 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" @@ -673,12 +386,12 @@ msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK_ON c=17 r=1 -#: ultralcd.cpp:5561 +#: ultralcd.cpp:5663 msgid "Fans check [on]" msgstr "Sprawd.went. [wl]" # MSG_FANS_CHECK_OFF c=17 r=1 -#: ultralcd.cpp:5563 +#: ultralcd.cpp:5665 msgid "Fans check [off]" msgstr "Sprawd.went.[wyl]" @@ -687,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:5046 +#: ultralcd.cpp:5148 msgid "Fil. sensor [N/A]" msgstr "Czuj. filam.[N/D]" @@ -703,22 +411,17 @@ msgid "Fil. sensor [off]" msgstr "Czuj. filam.[wyl]" # -#: ultralcd.cpp:1881 +#: ultralcd.cpp:1852 msgid "Filam. runouts" msgstr "Konc. filamentu" -# MSG_FILAMENT c=17 r=1 -#: messages.c:30 -msgid "Filament" -msgstr "Filament" - # MSG_FILAMENT_CLEAN c=20 r=2 #: messages.c:32 msgid "Filament extruding & with correct color?" -msgstr "Filament wychodzi z dyszy a kolor jest czysty?" +msgstr "Filament wychodzi z dyszy, kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2669 +#: ultralcd.cpp:2714 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" @@ -727,68 +430,33 @@ msgstr "Fil. nie zaladowany" 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:2838 +#: ultralcd.cpp:2885 msgid "Filament used" msgstr "Uzyty filament" -# MSG_STATS_FILAMENTUSED c=20 -#: ultralcd.cpp:2142 -msgid "Filament used: " -msgstr "Uzywany filament:" +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2886 +msgid "Print time" +msgstr "Czas druku" # MSG_FILE_INCOMPLETE c=20 r=2 -#: ultralcd.cpp:8346 +#: ultralcd.cpp:8432 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" -# MSG_SD_FILE_OPENED -#: cardreader.cpp:395 -msgid "File opened: " -msgstr "Otwarty plik:" - -# MSG_SD_FILE_SELECTED -#: cardreader.cpp:401 -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 #: messages.c:105 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4880 +#: ultralcd.cpp:4982 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." @@ -798,14 +466,14 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6932 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2099 +#: ultralcd.cpp:2206 msgid "forum.prusa3d.com" -msgstr "forum.prusa3d.com" +msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 #: messages.c:75 @@ -813,157 +481,152 @@ msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3217 +#: ultralcd.cpp:3294 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:7871 +#: ultralcd.cpp:7957 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?" +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:7887 +msgid "Heater/Thermistor" +msgstr "Grzalka/Termistor" -# -#: 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." +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:8467 +msgid "Heating disabled by safety timer." +msgstr "Grzanie wylaczone przez wyl. czasowy" -# -#: 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:7801 -msgid "Heater/Thermistor" -msgstr "Grzalka/Termistor" +# MSG_HEATING_COMPLETE c=20 +#: messages.c:47 +msgid "Heating done." +msgstr "Grzanie zakonczone" # MSG_HEATING #: messages.c:46 msgid "Heating" msgstr "Grzanie..." -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:8411 -msgid "Heating disabled by safety timer." -msgstr "Grzanie wylaczone przez wyl. czasowy" - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:47 -msgid "Heating done." -msgstr "Grzanie zakonczone" - # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4859 +#: ultralcd.cpp:4961 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:2100 +#: ultralcd.cpp:2207 msgid "howto.prusa3d.com" -msgstr "howto.prusa3d.com" +msgstr "" -# -#: messages.c:87 -msgid "HW Setup" -msgstr "Ustawienia HW" +# MSG_FILAMENTCHANGE +#: messages.c:37 +msgid "Change filament" +msgstr "Wymiana filamentu" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2629 +msgid "Change success!" +msgstr "Wymiana ok!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2706 +msgid "Changed correctly?" +msgstr "Wymiana ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:81 +msgid "Checking bed " +msgstr "Kontrola stolu" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8286 +msgid "Checking endstops" +msgstr "Kontrola krancowek" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8292 +msgid "Checking hotend " +msgstr "Kontrola hotendu" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:82 +msgid "Checking sensors " +msgstr "Sprawdzanie czujnikow" + +# MSG_SELFTEST_CHECK_X c=20 +#: ultralcd.cpp:8287 +msgid "Checking X axis " +msgstr "Kontrola osi X" + +# MSG_SELFTEST_CHECK_Y c=20 +#: ultralcd.cpp:8288 +msgid "Checking Y axis " +msgstr "Kontrola osi Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: ultralcd.cpp:8289 +msgid "Checking Z axis " +msgstr "Kontrola osi Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:49 +msgid "Choose extruder:" +msgstr "Wybierz ekstruder:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:50 +msgid "Choose filament:" +msgstr "Wybierz filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:30 +msgid "Filament" +msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4889 +#: ultralcd.cpp:4991 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:4897 +#: ultralcd.cpp:4999 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ultralcd.cpp:4962 +#: ultralcd.cpp:5064 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:99 msgid "Info screen" msgstr "Ekran informacyjny" -# MSG_INIT_SDCARD -#: ultralcd.cpp:5785 -msgid "Init. SD card" -msgstr "Inicjalizacja karty SD" +# +#: ultralcd.cpp:5024 +msgid "Is filament 1 loaded?" +msgstr "Filament 1 zaladowany?" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2614 msgid "Insert filament" msgstr "Wprowadz filament" -# 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: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:4925 +#: ultralcd.cpp:5027 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_WIZARD_PLA_FILAMENT c=20 r=2 -#: ultralcd.cpp:4956 +#: ultralcd.cpp:5058 msgid "Is it PLA filament?" msgstr "Czy to filament PLA?" # MSG_PLA_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4701 +#: ultralcd.cpp:4790 msgid "Is PLA filament loaded?" msgstr "Fialment PLA jest zaladowany?" @@ -972,98 +635,48 @@ msgstr "Fialment PLA jest zaladowany?" 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 " - -# MSG_KILLED -#: Marlin_main.cpp:7552 -msgid "KILLED. " -msgstr "PRZERWANE." - -# -#: ultralcd.cpp:1828 -msgid "Last print" -msgstr "Ost. wydruk" - # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1795 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:2967 -msgid "Left" -msgstr "Lewa" +#: ultralcd.cpp:1772 +msgid "Last print" +msgstr "Ost. wydruk" # MSG_SELFTEST_EXTRUDER_FAN c=20 #: messages.c:76 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" +# +#: ultralcd.cpp:3018 +msgid "Left" +msgstr "Lewa" + # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3215 +#: ultralcd.cpp:3292 msgid "Left side [um]" msgstr "Lewo [um]" -# MSG_LEFT c=12 r=1 -#: ultralcd.cpp:2308 -msgid "Left:" -msgstr "Lewo:" - # -#: ultralcd.cpp:5575 +#: ultralcd.cpp:5680 msgid "Lin. correction" -msgstr "Korekcja lin." +msgstr "Korekcja liniowa" # MSG_BABYSTEP_Z #: messages.c:13 msgid "Live adjust Z" msgstr "Ustaw. Live Z" -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6059 -msgid "Load all" -msgstr "Zalad. wszystkie" - # MSG_LOAD_FILAMENT c=17 #: messages.c:51 msgid "Load filament" msgstr "Ladowanie fil." -# MSG_LOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5576 -msgid "Load filament 1" -msgstr "Zaladuj fil. 1" - -# MSG_LOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5577 -msgid "Load filament 2" -msgstr "Zaladuj fil. 2" - -# MSG_LOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5578 -msgid "Load filament 3" -msgstr "Zaladuj fil. 3" - -# MSG_LOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5579 -msgid "Load filament 4" -msgstr "Zaladuj fil. 4" - -# MSG_LOAD_FILAMENT_5 c=17 -#: ultralcd.cpp:5582 -msgid "Load filament 5" -msgstr "Laduj filament 5" - -# -#: ultralcd.cpp:6714 -msgid "Load to nozzle" -msgstr "Zaladuj do dyszy" - # MSG_LOADING_COLOR -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2654 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -1073,175 +686,70 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:7855 +#: ultralcd.cpp:7941 msgid "Loose pulley" msgstr "Luzne kolo pasowe" -# MSG_M104_INVALID_EXTRUDER -#: Marlin_main.cpp:7675 -msgid "M104 Invalid extruder " -msgstr "M104 Nieprawidlowy ekstruder" - -# MSG_M105_INVALID_EXTRUDER -#: Marlin_main.cpp:7678 -msgid "M105 Invalid extruder " -msgstr "M105 Nieprawidlowy ekstruder" - -# MSG_M109_INVALID_EXTRUDER -#: Marlin_main.cpp:7681 -msgid "M109 Invalid extruder " -msgstr "M109 Nieprawidlowy ekstruder" +# +#: ultralcd.cpp:6805 +msgid "Load to nozzle" +msgstr "Zaladuj do dyszy" # MSG_M117_V2_CALIBRATION c=25 r=1 #: messages.c:55 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" -# MSG_M200_INVALID_EXTRUDER -#: Marlin_main.cpp:5857 -msgid "M200 Invalid extruder " -msgstr "M200 Nieprawidlowy ekstruder" - -# MSG_M218_INVALID_EXTRUDER -#: Marlin_main.cpp:7684 -msgid "M218 Invalid extruder " -msgstr "M218 Nieprawidlowy ekstruder" - -# MSG_M221_INVALID_EXTRUDER -#: Marlin_main.cpp:7687 -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:56 msgid "Main" msgstr "Menu glowne" -# MSG_MARK_FIL c=20 r=8 -#: ultralcd.cpp:3840 -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:3002 -msgid "Measured skew" -msgstr "Zmierzony skos" - -# MSG_MEASURED_SKEW c=15 r=1 -#: ultralcd.cpp:2335 -msgid "Measured skew:" -msgstr "Zmierzony skos:" - # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 #: 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:5658 +#: ultralcd.cpp:5763 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" -# -#: ultralcd.cpp:5572 -msgid "Mesh bed leveling" -msgstr "Poziomowanie wg siatki" +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:762 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Wznawianie pozycji." -# -#: Marlin_main.cpp:881 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Wykryto firmware MK3 w drukarce MK3S" +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:755 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: Marlin_main.cpp:856 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Wykryto firmware MK3S w drukarce MK3" +#: ultralcd.cpp:3059 +msgid "Measured skew" +msgstr "Zmierzony skos" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1796 msgid "MMU fails" msgstr "Bledy MMU" # -#: mmu.cpp:1617 +#: mmu.cpp:1613 msgid "MMU load failed " msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1845 +#: ultralcd.cpp:1797 msgid "MMU load fails" msgstr "Bledy ladow. MMU" -# -#: 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." - -# 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 wymaga uwagi. Napraw usterke i wcisnij przycisk na korpusie MMU." - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:762 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Wznawianie pozycji." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:755 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Wznawiam nagrzewanie..." - # MSG_MMU_OK_RESUMING c=20 r=4 #: mmu.cpp:773 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." -# -#: ultralcd.cpp:1862 -msgid "MMU power fails" -msgstr "Zaniki zasil. MMU" - -# -#: ultralcd.cpp:2112 -msgid "MMU2 connected" -msgstr "MMU podlaczone" - # MSG_STEALTH_MODE_OFF #: messages.c:90 msgid "Mode [Normal]" @@ -1252,15 +760,20 @@ msgstr "Tryb [normalny]" msgid "Mode [silent]" msgstr "Tryb [cichy]" +# +#: mmu.cpp:719 +msgid "MMU needs user attention." +msgstr "MMU wymaga uwagi uzytkownika." + +# +#: ultralcd.cpp:1823 +msgid "MMU power fails" +msgstr "Zaniki zasil. MMU" + # MSG_STEALTH_MODE_ON #: messages.c:91 msgid "Mode [Stealth]" -msgstr "Tryb [Stealth]" - -# -#: ultralcd.cpp:4424 -msgid "Mode change in progress ..." -msgstr "Trwa zmiana trybu..." +msgstr "Tryb [cichy]" # MSG_AUTO_MODE_ON #: messages.c:12 @@ -1273,19 +786,9 @@ 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.]" +#: ultralcd.cpp:2219 +msgid "MMU2 connected" +msgstr "MMU podlaczone" # MSG_SELFTEST_MOTOR #: messages.c:83 @@ -1293,212 +796,132 @@ msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5550 +#: ultralcd.cpp:5652 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4291 +#: ultralcd.cpp:4378 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4292 +#: ultralcd.cpp:4379 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4293 +#: ultralcd.cpp:4380 msgid "Move Z" msgstr "Ruch osi Z" +# MSG_NO_MOVE +#: Marlin_main.cpp:5292 +msgid "No move." +msgstr "Brak ruchu." + +# MSG_NO_CARD +#: ultralcd.cpp:6772 +msgid "No SD card" +msgstr "Brak karty SD" + # -#: ultralcd.cpp:2973 +#: ultralcd.cpp:3024 msgid "N/A" msgstr "N/D" -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Dostepna nowa wersja firmware:" - # MSG_NO #: messages.c:62 msgid "No" msgstr "Nie" -# -#: -msgid "No " -msgstr "Nie" - -# MSG_ERR_NO_CHECKSUM -#: cmdqueue.cpp:456 -msgid "No Checksum with line number, Last Line: " -msgstr "Brak sumy kontrolnej z numerem linii, ostatnia linia:" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5254 -msgid "No move." -msgstr "Brak ruchu." - -# MSG_NO_CARD -#: ultralcd.cpp:6694 -msgid "No SD card" -msgstr "Brak karty SD" - -# MSG_ERR_NO_THERMISTORS -#: Marlin_main.cpp:4946 -msgid "No thermistors - no temperature" -msgstr "Brak termistorow - brak odczytu temperatury" - # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:7803 +#: ultralcd.cpp:7889 msgid "Not connected" msgstr "Nie podlaczono " +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Dostepna nowa wersja firmware:" + # MSG_SELFTEST_FAN_NO c=19 #: messages.c:79 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:5063 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:4905 +#: ultralcd.cpp:5007 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." -# -#: ultralcd.cpp:4896 -msgid "Now remove the test print from steel sheet." -msgstr "Teraz zdejmij wydruk testowy ze stolu." - # MSG_NOZZLE #: messages.c:63 msgid "Nozzle" msgstr "Dysza" -# -#: 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" - -# MSG_INFO_NOZZLE_FAN c=11 r=1 -#: ultralcd.cpp:1537 -msgid "Nozzle FAN:" -msgstr "Went. dyszy:" - -# MSG_NOZZLE1 -#: ultralcd.cpp:5995 -msgid "Nozzle2" -msgstr "Dysza2" - -# MSG_NOZZLE2 -#: ultralcd.cpp:5998 -msgid "Nozzle3" -msgstr "Dysza3" - -# MSG_OK -#: Marlin_main.cpp:6333 -msgid "ok" -msgstr "ok" - # MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 -#: Marlin_main.cpp:1535 +#: 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." -# MSG_ENDSTOP_OPEN -#: messages.c:29 -msgid "open" -msgstr "otworz" - -# MSG_SD_OPEN_FILE_FAIL -#: messages.c:79 -msgid "open failed, File: " -msgstr "niepowodzenie otwarcia, Plik:" +# +#: ultralcd.cpp:4998 +msgid "Now remove the test print from steel sheet." +msgstr "Teraz zdejmij wydruk testowy ze stolu." -# MSG_SD_OPENROOT_FAIL -#: cardreader.cpp:196 -msgid "openRoot failed" -msgstr "niepowodzenie openRoot " +# +#: ultralcd.cpp:1722 +msgid "Nozzle FAN" +msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6657 +#: ultralcd.cpp:6735 msgid "Pause print" msgstr "Wstrzymanie wydruku" -# MSG_PICK_Z -#: ultralcd.cpp:3463 -msgid "Pick print" -msgstr "Wybierz wydruk" - # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1613 +#: ultralcd.cpp:1606 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1619 +#: ultralcd.cpp:1612 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5664 +#: ultralcd.cpp:5769 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:862 +#: ultralcd.cpp:846 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" -# -#: ultralcd.cpp:3939 -msgid "PINDA:" -msgstr "PINDA:" - # MSG_PAPER c=20 r=8 #: 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:5072 +msgid "Please clean heatbed and then press the knob." +msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:22 +msgid "Please clean the nozzle for calibration. Click when done." +msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." + # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:7795 +#: ultralcd.cpp:7881 msgid "Please check :" msgstr "Sprawdz :" @@ -1507,38 +930,18 @@ msgstr "Sprawdz :" 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:4970 -msgid "Please clean heatbed and then press the knob." -msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 -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:4804 +#: ultralcd.cpp:4894 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: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." - -# 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 "Zaladuj filament PLA i przywroc Asystenta przez restart drukarki." - # MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ultralcd.cpp:4706 +#: ultralcd.cpp:4795 msgid "Please load PLA filament first." msgstr "Najpierw zaladuj filament PLA." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3083 +#: Marlin_main.cpp:3064 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." @@ -1552,110 +955,75 @@ msgstr "Prosze umiescic plyte stalowa na stole podgrzewanym." msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" +# +#: ultralcd.cpp:4889 +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:70 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1441 +#: mmu.cpp:1440 msgid "Please remove filament and then press the knob." msgstr "Wyciagnij filament i wcisnij pokretlo." -# -#: ultralcd.cpp:4895 -msgid "Please remove shipping helpers first." -msgstr "Najpierw usun zabezpieczenia transportowe" - # MSG_REMOVE_STEEL_SHEET c=20 r=4 #: 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:4317 +#: Marlin_main.cpp:4355 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1360 +#: mmu.cpp:1359 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "Prosze zaktualizowac Firmware MMU2. Czekam na reset." -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prosze zaktualizowac." - # MSG_PLEASE_WAIT c=20 #: messages.c:66 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:1881 -msgid "Power failures" -msgstr "Zaniki zasilania" - -# MSG_POWERUP -#: messages.c:69 -msgid "PowerUp" -msgstr "Uruchamianie" - -# MSG_PREHEAT -#: ultralcd.cpp:6644 -msgid "Preheat" -msgstr "Grzanie" +#: ultralcd.cpp:4997 +msgid "Please remove shipping helpers first." +msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_PREHEAT_NOZZLE c=20 #: messages.c:67 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" +# MSG_PREHEAT +#: ultralcd.cpp:6722 +msgid "Preheat" +msgstr "Grzanie" + # MSG_WIZARD_HEATING c=20 r=3 #: messages.c:102 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." # -#: 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:2284 -msgid "Preheating to unload" -msgstr "Nagrzew. do rozlad." - -# MSG_PREPARE_FILAMENT c=20 r=1 -#: ultralcd.cpp:1911 -msgid "Prepare new filament" -msgstr "Przygotuj filament" +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:10312 +#: Marlin_main.cpp:10364 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # -#: ultralcd.cpp:2210 -msgid "Press the knob" -msgstr "Wcisnij pokretlo" - -# -#: mmu.cpp:723 -msgid "Press the knob to resume nozzle temperature." -msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." +#: ultralcd.cpp:1851 +msgid "Power failures" +msgstr "Zaniki zasilania" # MSG_PRINT_ABORTED c=20 #: messages.c:69 @@ -1663,182 +1031,87 @@ msgid "Print aborted" msgstr "Druk przerwany" # -#: ultralcd.cpp:1789 -msgid "Print FAN" -msgstr "Went. wydruku" +#: ultralcd.cpp:2455 +msgid "Preheating to load" +msgstr "Nagrzew. do ladowania" -# MSG_INFO_PRINT_FAN c=11 r=1 -#: ultralcd.cpp:1549 -msgid "Print FAN: " -msgstr "Went. wydr:" +# +#: ultralcd.cpp:2459 +msgid "Preheating to unload" +msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8221 +#: ultralcd.cpp:8307 msgid "Print fan:" -msgstr "Went. wydruku:" +msgstr "WentWydruk:" # MSG_CARD_MENU #: messages.c:21 msgid "Print from SD" msgstr "Druk z karty SD" +# +#: ultralcd.cpp:2317 +msgid "Press the knob" +msgstr "Wcisnij pokretlo" + # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1080 +#: ultralcd.cpp:1069 msgid "Print paused" msgstr "Druk wstrzymany" -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2838 -msgid "Print time" -msgstr "Czas druku" - -# MSG_STATS_PRINTTIME c=20 -#: ultralcd.cpp:2151 -msgid "Print time: " -msgstr "Czas druku: " - -# MSG_PRINTER_DISCONNECTED c=20 r=1 -#: ultralcd.cpp:607 -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!" -msgstr "Drukarka zatrzymana. Wywolano komende kill()!" +#: mmu.cpp:723 +msgid "Press the knob to resume nozzle temperature." +msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # 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 "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)" -msgstr "Drukarka zatrzymana z powodu bledow. Usun problem i uzyj M999 aby zrestartowac. (Temperatura jest zresetowana, ustaw ja po restarcie)" +msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: -msgid "Prusa i3 MK2 ready." -msgstr "Prusa i3 MK2 gotowa" - -# WELCOME_MSG c=20 -#: -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." -msgstr "Prusa i3 MK3 gotowa" - -# -#: -msgid "Prusa i3 MK3S OK." -msgstr "Prusa i3 MK3S OK" +#: ultralcd.cpp:1723 +msgid "Print FAN" +msgstr "WentWydruk" # MSG_PRUSA3D -#: ultralcd.cpp:2098 +#: ultralcd.cpp:2205 msgid "prusa3d.com" -msgstr "prusa3d.com" +msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3218 +#: ultralcd.cpp:3295 msgid "Rear side [um]" msgstr "Tyl [um]" # MSG_RECOVERING_PRINT c=20 r=1 -#: Marlin_main.cpp:9712 +#: Marlin_main.cpp:9764 msgid "Recovering print " msgstr "Wznawianie wydruku" -# MSG_REFRESH -#: -msgid "Refresh" -msgstr "Odswiez" - # MSG_REMOVE_OLD_FILAMENT c=20 r=4 #: 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" -msgstr "Raportowanie statusu krancowek" - -# -#: Marlin_main.cpp:7076 -msgid "Resend" -msgstr "Wyslij ponownie" - -# MSG_RESEND -#: Marlin_main.cpp:6911 -msgid "Resend: " -msgstr "Wyslij ponownie:" - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3219 -msgid "Reset" -msgstr "Reset" +#: +msgid "Prusa i3 MK3S OK." +msgstr "Prusa i3 MK3S OK" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5669 +#: ultralcd.cpp:5774 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" +# MSG_BED_CORRECTION_RESET +#: ultralcd.cpp:3296 +msgid "Reset" +msgstr "" + # MSG_RESUME_PRINT -#: ultralcd.cpp:6664 +#: ultralcd.cpp:6742 msgid "Resume print" msgstr "Wznowic wydruk" @@ -1847,115 +1120,70 @@ msgstr "Wznowic wydruk" msgid "Resuming print" msgstr "Wznawianie druku" -# -#: ultralcd.cpp:2968 -msgid "Right" -msgstr "Prawa" - # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3216 +#: ultralcd.cpp:3293 msgid "Right side[um]" msgstr "Prawo [um]" -# MSG_RIGHT c=12 r=1 -#: ultralcd.cpp:2309 -msgid "Right:" -msgstr "Prawo:" - -# MSG_E_CAL_KNOB c=20 r=8 -#: ultralcd.cpp:3835 -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:5587 +#: ultralcd.cpp:5692 msgid "RPi port [on]" msgstr "Port RPi [wl]" # MSG_SECOND_SERIAL_OFF c=17 r=1 -#: ultralcd.cpp:5585 +#: ultralcd.cpp:5690 msgid "RPi port [off]" msgstr "Port RPi [wyl]" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4723 +#: ultralcd.cpp:4812 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:5220 +#: ultralcd.cpp:5322 msgid "SD card [normal]" msgstr "Karta SD [normal]" -# MSG_SD_CARD_OK -#: cardreader.cpp:202 -msgid "SD card ok" -msgstr "Karta SD OK" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:4238 -msgid "SD card [FlshAir]" -msgstr "Karta SD [FlashAir]" - # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 -#: ultralcd.cpp:5218 +#: ultralcd.cpp:5320 msgid "SD card [flshAir]" msgstr "Karta SD[FlshAir]" -# MSG_SD_INIT_FAIL -#: cardreader.cpp:186 -msgid "SD init fail" -msgstr "Inicjalizacja karty SD nieudana" - -# MSG_SD_PRINTING_BYTE -#: cardreader.cpp:516 -msgid "SD printing byte " -msgstr "SD printing byte " +# +#: ultralcd.cpp:3019 +msgid "Right" +msgstr "Prawa" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 #: messages.c:38 msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" -# -#: ultralcd.cpp:6601 -msgid "Select" -msgstr "Wybierz" - # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5594 +#: ultralcd.cpp:5699 msgid "Select language" msgstr "Wybor jezyka" -# -#: ultralcd.cpp:4943 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." - -# -#: ultralcd.cpp:4692 -msgid "Select PLA filament:" -msgstr "Wybierz filament PLA:" - # MSG_SELFTEST_OK -#: ultralcd.cpp:7366 +#: ultralcd.cpp:7452 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7152 +#: ultralcd.cpp:7238 msgid "Self test start " -msgstr "Rozpoczynanie Selftestu" +msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5645 +#: ultralcd.cpp:5750 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:7793 +#: ultralcd.cpp:7879 msgid "Selftest error !" -msgstr "Blad selftest !" +msgstr "Blad selftest!" # MSG_SELFTEST_FAILED c=20 #: messages.c:77 @@ -1963,139 +1191,64 @@ msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1567 +#: 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:2138 -msgid "Sensor info" -msgstr "Info o sensorach" - -# -#: ultralcd.cpp:3938 -msgid "Sensor state" -msgstr "Stan czujnikow" +#: ultralcd.cpp:5045 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # -#: -msgid "Sensors info" -msgstr "Info o czujnikach" +#: ultralcd.cpp:4780 +msgid "Select PLA filament:" +msgstr "Wybierz filament PLA:" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3227 +#: ultralcd.cpp:3314 msgid "Set temperature:" -msgstr "Ustaw. temperatury:" +msgstr "Ustaw temperature:" # MSG_SETTINGS #: messages.c:86 msgid "Settings" msgstr "Ustawienia" -# -#: ultralcd.cpp:3005 -msgid "Severe skew" -msgstr "Znaczny skos" - -# MSG_SEVERE_SKEW c=15 r=1 -#: ultralcd.cpp:2346 -msgid "Severe skew:" -msgstr "Powazny skos:" - -# -#: messages.c:58 -msgid "Sheet" -msgstr "Plyta" - # MSG_SHOW_END_STOPS c=17 r=1 -#: ultralcd.cpp:5666 +#: ultralcd.cpp:5771 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: -msgid "Show pinda state" -msgstr "Stan sondy PINDA" - -# MSG_DWELL -#: Marlin_main.cpp:3752 -msgid "Sleep..." -msgstr "Czuwanie..." - -# -#: ultralcd.cpp:3004 -msgid "Slight skew" -msgstr "Lekki skos" - -# MSG_SLIGHT_SKEW c=15 r=1 -#: ultralcd.cpp:2342 -msgid "Slight skew:" -msgstr "Lekki skos:" +#: ultralcd.cpp:4025 +msgid "Sensor state" +msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=4 #: 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: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 +#: ultralcd.cpp:5332 msgid "Sort [none]" msgstr "Sortowanie [brak]" # MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5228 +#: ultralcd.cpp:5330 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]" -msgstr "Sortuj: [brak]" - -# MSG_SORT_NONE c=17 r=1 -#: ultralcd.cpp:5043 -msgid "Sort: [none]" -msgstr "Sortuj: [brak]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:4248 -msgid "Sort: [Time]" -msgstr "Sortuj: [czas]" - -# MSG_SORT_TIME c=17 r=1 -#: ultralcd.cpp:5041 -msgid "Sort: [time]" -msgstr "Sortuj: [czas]" - -# MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:4249 -msgid "Sort: [Alphabet]" -msgstr "Sortuj:[alfabet]" +# +#: ultralcd.cpp:3062 +msgid "Severe skew:" +msgstr "Znaczny skos:" # MSG_SORT_ALPHA c=17 r=1 -#: ultralcd.cpp:5042 -msgid "Sort: [alphabet]" -msgstr "Sortuj: [alfabet]" - -# MSG_SORT_NONE c=17 r=1 -#: -msgid "Sort: [none]" -msgstr "Sortuj: [brak]" - -# MSG_SORT_TIME c=17 r=1 -#: -msgid "Sort: [time]" -msgstr "Sortuj: [czas]" +#: ultralcd.cpp:5331 +msgid "Sort [alphabet]" +msgstr "Sortowanie[alfab]" # MSG_SORTING c=20 r=1 #: cardreader.cpp:746 @@ -2105,35 +1258,35 @@ msgstr "Sortowanie plikow" # MSG_SOUND_LOUD c=17 r=1 #: sound.h:6 msgid "Sound [loud]" -msgstr "Dzwiek [Glosny]" +msgstr "Dzwiek [glosny]" + +# +#: ultralcd.cpp:3061 +msgid "Slight skew:" +msgstr "Lekki skos:" # MSG_SOUND_MUTE c=17 r=1 -#: +#: msgid "Sound [mute]" -msgstr "Dzwiek[Wylaczony]" +msgstr "Dzwiek[wylaczony]" + +# +#: Marlin_main.cpp:4871 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Wykryto problem, wymuszono poziomowanie osi Z." # MSG_SOUND_ONCE c=17 r=1 #: 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:8 msgid "Sound [silent]" -msgstr "Dzwiek [Cichy]" +msgstr "Dzwiek [cichy]" # MSG_SPEED -#: ultralcd.cpp:6840 +#: ultralcd.cpp:6926 msgid "Speed" msgstr "Predkosc" @@ -2142,41 +1295,16 @@ msgstr "Predkosc" msgid "Spinning" msgstr "Kreci sie" -# MSG_AUTO_DEPLETE_ON c=17 r=1 -#: ultralcd.cpp:5098 -msgid "SpoolJoin [on]" -msgstr "SpoolJoin [wl]" - -# -#: ultralcd.cpp:5094 -msgid "SpoolJoin [N/A]" -msgstr "SpoolJoin [nd]" - -# MSG_AUTO_DEPLETE_OFF c=17 r=1 -#: ultralcd.cpp:5102 -msgid "SpoolJoin [off]" -msgstr "SpoolJoin [wyl]" - # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4330 +#: Marlin_main.cpp:4368 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:6753 +#: ultralcd.cpp:6839 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:93 msgid "Stop print" @@ -2188,12 +1316,12 @@ msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6762 +#: ultralcd.cpp:6848 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:7873 +#: ultralcd.cpp:7959 msgid "Swapped" msgstr "Zamieniono" @@ -2203,42 +1331,37 @@ msgid "Temp. cal. " msgstr "Kalibracja temp." # MSG_TEMP_CALIBRATION_ON c=20 r=1 -#: ultralcd.cpp:5581 +#: ultralcd.cpp:5686 msgid "Temp. cal. [on]" -msgstr "Kalibr. temp.[wl]" +msgstr "Kalibr.temp. [wl]" # MSG_TEMP_CALIBRATION_OFF c=20 r=1 -#: ultralcd.cpp:5579 +#: ultralcd.cpp:5684 msgid "Temp. cal. [off]" msgstr "Kalibr.temp.[wyl]" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5675 +#: ultralcd.cpp:5780 msgid "Temp. calibration" msgstr "Kalibracja temp." -# MSG_TEMPERATURE -#: ultralcd.cpp:5548 -msgid "Temperature" -msgstr "Temperatura" - # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3951 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" -# MSG_PINDA_NOT_CALIBRATED c=20 r=4 -#: Marlin_main.cpp:1403 -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: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:5650 +msgid "Temperature" +msgstr "Temperatura" + # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2144 +#: ultralcd.cpp:2251 msgid "Temperatures" msgstr "Temperatury" @@ -2248,162 +1371,107 @@ 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:2217 -msgid "to load filament" -msgstr "aby zaladow. fil." - -# -#: ultralcd.cpp:2221 -msgid "to unload filament" -msgstr "aby rozlad. filament" - -# -#: ultralcd.cpp:1829 -msgid "Total" -msgstr "Suma" - -# -#: ultralcd.cpp:1862 -msgid "Total failures" -msgstr "Suma bledow" - -# -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total filament" -msgstr "Calkowita dlugosc filamentu" - -# MSG_STATS_TOTALFILAMENT c=20 -#: ultralcd.cpp:2186 -msgid "Total filament :" -msgstr "Filament lacznie :" +msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2860 +#: ultralcd.cpp:2908 msgid "Total print time" -msgstr "Calkowity czas druku" - -# MSG_STATS_TOTALPRINTTIME c=20 -#: ultralcd.cpp:2203 -msgid "Total print time :" -msgstr "Calkowity czas druku:" - -# MSG_ENDSTOP_HIT -#: messages.c:28 -msgid "TRIGGERED" -msgstr "AKTYWOWANO" +msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6641 +#: ultralcd.cpp:6719 msgid "Tune" msgstr "Strojenie" # -#: ultralcd.cpp:2120 -msgid "unknown" -msgstr "nieznane" - -# -#: ultralcd.cpp:4780 +#: ultralcd.cpp:4869 msgid "Unload" msgstr "Rozladuj" # -#: ultralcd.cpp:5617 -msgid "Unload all" -msgstr "Rozladuj wszystkie" +#: ultralcd.cpp:1820 +msgid "Total failures" +msgstr "Suma bledow" + +# +#: ultralcd.cpp:2324 +msgid "to load filament" +msgstr "aby zaladow. fil." + +# +#: ultralcd.cpp:2328 +msgid "to unload filament" +msgstr "aby rozlad. filament" # MSG_UNLOAD_FILAMENT c=17 #: messages.c:97 msgid "Unload filament" msgstr "Rozladowanie fil." -# MSG_UNLOAD_FILAMENT_1 c=17 -#: ultralcd.cpp:5406 -msgid "Unload filament 1" -msgstr "Rozladuj fil. 1" - -# MSG_UNLOAD_FILAMENT_2 c=17 -#: ultralcd.cpp:5407 -msgid "Unload filament 2" -msgstr "Rozladuj fil. 2" - -# MSG_UNLOAD_FILAMENT_3 c=17 -#: ultralcd.cpp:5408 -msgid "Unload filament 3" -msgstr "Rozladuj fil. 3" - -# MSG_UNLOAD_FILAMENT_4 c=17 -#: ultralcd.cpp:5409 -msgid "Unload filament 4" -msgstr "Rozladuj fil. 4" - # MSG_UNLOADING_FILAMENT c=20 r=1 #: messages.c:98 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: 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." +#: ultralcd.cpp:1773 +msgid "Total" +msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5803 +#: ultralcd.cpp:5908 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2147 +#: ultralcd.cpp:2254 msgid "Voltages" msgstr "Napiecia" -# MSG_SD_VOL_INIT_FAIL -#: cardreader.cpp:191 -msgid "volume.init failed" -msgstr "niepowodzenie volume.init " +# +#: ultralcd.cpp:2227 +msgid "unknown" +msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:5225 +#: Marlin_main.cpp:5263 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3371 +#: ultralcd.cpp:3458 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3335 +#: ultralcd.cpp:3422 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" +# +#: ultralcd.cpp:4868 +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:1527 +#: 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:1519 +#: 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:1523 +#: Marlin_main.cpp:1507 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" -# MSG_FW_VERSION_UNKNOWN c=20 r=8 -#: Marlin_main.cpp:946 -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:3072 +#: Marlin_main.cpp:3054 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" @@ -2413,146 +1481,332 @@ msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5642 +#: ultralcd.cpp:5747 msgid "Wizard" msgstr "Asystent" -# MSG_SD_WORKDIR_FAIL -#: messages.c:78 -msgid "workDir open failed" -msgstr "blad otwierania workDir" - -# MSG_SD_WRITE_TO_FILE -#: cardreader.cpp:424 -msgid "Writing to file: " -msgstr "Zapis do pliku:" - -# -#: ultralcd.cpp:4885 -msgid "X-correct" -msgstr "Korekcja X" - -# -#: ultralcd.cpp:5028 -msgid "X-correct:" -msgstr "Korekcja-X:" - # MSG_XYZ_DETAILS c=19 r=1 -#: ultralcd.cpp:2136 +#: ultralcd.cpp:2243 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:19 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." + +# MSG_YES +#: messages.c:104 +msgid "Yes" +msgstr "Tak" + +# MSG_WIZARD_QUIT c=20 r=8 +#: 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:3835 +#: ultralcd.cpp:3922 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:3832 +#: ultralcd.cpp:3919 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:5130 +msgid "X-correct:" +msgstr "Korekcja-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3916 +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:3813 +#: ultralcd.cpp:3900 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibr. XYZ niedokladna. Przednie punkty kalibr. nieosiagalne." -# 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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3903 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6166 +msgid "Load all" +msgstr "Zalad. wszystkie" + # -#: ultralcd.cpp:3795 +#: ultralcd.cpp:3882 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3801 +#: ultralcd.cpp:3888 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_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:19 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." - -# -#: ultralcd.cpp:3804 +#: ultralcd.cpp:3891 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:3829 -msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" -msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" - # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:3016 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" -# MSG_Y_DISTANCE_FROM_MIN c=20 r=1 -#: ultralcd.cpp:2306 -msgid "Y distance from min:" -msgstr "Min. odleglosc od Y:" +# +#: ultralcd.cpp:5131 +msgid "Y-correct:" +msgstr "Korekcja-Y:" + +# MSG_OFF +#: menu.cpp:426 +msgid " [off]" +msgstr " [wyl]" + +# +#: messages.c:57 +msgid "Back" +msgstr "Wstecz" + +# +#: ultralcd.cpp:5639 +msgid "Checks" +msgstr "Testy" # -#: ultralcd.cpp:4886 -msgid "Y-correct" -msgstr "Korekcja Y" +#: ultralcd.cpp:7973 +msgid "False triggering" +msgstr "Falszywy alarm" # -#: ultralcd.cpp:5029 -msgid "Y-correct:" -msgstr "Korekcja-Y:" +#: ultralcd.cpp:4030 +msgid "FINDA:" +msgstr "" -# MSG_YES -#: messages.c:104 -msgid "Yes" -msgstr "Tak" +# +#: ultralcd.cpp:5545 +msgid "Firmware [none]" +msgstr "Firmware [brak]" -# MSG_FW_VERSION_ALPHA c=20 r=8 -#: Marlin_main.cpp:930 -msgid "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." -msgstr "Uzywasz firmware w wersji alpha. Jest to niezalecana wersja rozwojowa. Moze spowodowac uszkodzenie drukarki." +# +#: ultralcd.cpp:5551 +msgid "Firmware [strict]" +msgstr "Firmware [restr.]" -# 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 "Uzywasz firmware w wersji beta. Ta wersja jest rozwojowa. Uzywanie jej nie jest zalecane i moze spowodowac uszkodzenie drukarki." +# +#: ultralcd.cpp:5548 +msgid "Firmware [warn]" +msgstr "Firmware[ostrzez]" -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:103 -msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +# +#: messages.c:87 +msgid "HW Setup" +msgstr "Ustawienia HW" + +# +#: ultralcd.cpp:4034 +msgid "IR:" +msgstr "" + +# +#: ultralcd.cpp:7046 +msgid "Magnets comp.[N/A]" +msgstr "Kor. magnesow[N/D]" + +# +#: ultralcd.cpp:7044 +msgid "Magnets comp.[Off]" +msgstr "Kor. magnesow[wyl]" + +# +#: ultralcd.cpp:7043 +msgid "Magnets comp. [On]" +msgstr "Kor. magnesow [wl]" + +# +#: ultralcd.cpp:7035 +msgid "Mesh [3x3]" +msgstr "Siatka [3x3]" + +# +#: ultralcd.cpp:7036 +msgid "Mesh [7x7]" +msgstr "Siatka [7x7]" + +# +#: ultralcd.cpp:5677 +msgid "Mesh bed leveling" +msgstr "Poziomowanie stolu" + +# +#: Marlin_main.cpp:856 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Wykryto firmware MK3S w drukarce MK3" + +# +#: ultralcd.cpp:5306 +msgid "MMU Mode [Normal]" +msgstr "Tryb MMU[Normaln]" + +# +#: ultralcd.cpp:5307 +msgid "MMU Mode[Stealth]" +msgstr "Tryb MMU[Stealth]" + +# +#: ultralcd.cpp:4511 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + +# +#: ultralcd.cpp:5506 +msgid "Model [none]" +msgstr "Model [brak]" + +# +#: ultralcd.cpp:5512 +msgid "Model [strict]" +msgstr "Model [restrykc.]" + +# +#: ultralcd.cpp:5509 +msgid "Model [warn]" +msgstr "Model [ostrzez.]" + +# +#: ultralcd.cpp:5467 +msgid "Nozzle d. [0.25]" +msgstr "Sr. dyszy [0,25]" + +# +#: ultralcd.cpp:5470 +msgid "Nozzle d. [0.40]" +msgstr "Sr. dyszy [0,40]" + +# +#: ultralcd.cpp:5473 +msgid "Nozzle d. [0.60]" +msgstr "Sr. dyszy [0,60]" # -#: ultralcd.cpp:5030 +#: ultralcd.cpp:5421 +msgid "Nozzle [none]" +msgstr "Dysza [brak]" + +# +#: ultralcd.cpp:5427 +msgid "Nozzle [strict]" +msgstr "Dysza [restrykc.]" + +# +#: ultralcd.cpp:5424 +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 "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." + +# +#: ultralcd.cpp:4026 +msgid "PINDA:" +msgstr "" + +# +#: ultralcd.cpp:2465 +msgid "Preheating to cut" +msgstr "Nagrzewanie do obciecia" + +# +#: ultralcd.cpp:2462 +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:6683 +msgid "Rename" +msgstr "Zmien nazwe" + +# +#: ultralcd.cpp:6679 +msgid "Select" +msgstr "Wybierz" + +# +#: ultralcd.cpp:2245 +msgid "Sensor info" +msgstr "Info o sensorach" + +# +#: messages.c:58 +msgid "Sheet" +msgstr "Plyta" + +# +#: sound.h:9 +msgid "Sound [assist]" +msgstr "Dzwiek [asyst.]" + +# +#: ultralcd.cpp:5637 +msgid "Steel sheets" +msgstr "Plyty stalowe" + +# +#: ultralcd.cpp:5132 msgid "Z-correct:" msgstr "Korekcja-Z:" # -#: ultralcd.cpp:6952 +#: ultralcd.cpp:7038 msgid "Z-probe nr. [1]" -msgstr "Pomiar-Z [1]" +msgstr "Ilosc Pomiarow [1]" # -#: ultralcd.cpp:6954 +#: ultralcd.cpp:7040 msgid "Z-probe nr. [3]" -msgstr "Pomiar-Z [3]" +msgstr "Ilosc Pomiarow [3]" -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3024 -msgid "[0;0] point offset" -msgstr "[0;0] przesuniecie punktu" From 89de5aac77f382fd0257fa3779fdd866f1ab2bf6 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Mon, 23 Sep 2019 17:13:33 +0200 Subject: [PATCH 154/190] default nozzle diameter for farm mode --- Firmware/eeprom.h | 1 + Firmware/util.cpp | 6 +++++- Firmware/util.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 482ddf932c..8276d61a72 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -25,6 +25,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #endif #define EEPROM_EMPTY_VALUE 0xFF +#define EEPROM_EMPTY_VALUE16 0xFFFF // The total size of the EEPROM is // 4096 for the Atmega2560 #define EEPROM_TOP 4096 diff --git a/Firmware/util.cpp b/Firmware/util.cpp index aa1a624da6..aac72ee0c3 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -341,13 +341,17 @@ if(oCheckMode==ClCheckMode::_Undef) eeprom_update_byte((uint8_t*)EEPROM_CHECK_MODE,(uint8_t)oCheckMode); } if(farm_mode) + { oCheckMode=ClCheckMode::_Strict; + if(eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM)==EEPROM_EMPTY_VALUE16) + eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); + } oNozzleDiameter=(ClNozzleDiameter)eeprom_read_byte((uint8_t*)EEPROM_NOZZLE_DIAMETER); if((oNozzleDiameter==ClNozzleDiameter::_Diameter_Undef)&& !farm_mode) { oNozzleDiameter=ClNozzleDiameter::_Diameter_400; eeprom_update_byte((uint8_t*)EEPROM_NOZZLE_DIAMETER,(uint8_t)oNozzleDiameter); - eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,400); + eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,EEPROM_NOZZLE_DIAMETER_uM_DEFAULT); } oCheckModel=(ClCheckModel)eeprom_read_byte((uint8_t*)EEPROM_CHECK_MODEL); if(oCheckModel==ClCheckModel::_Undef) diff --git a/Firmware/util.h b/Firmware/util.h index a9bbcb1d62..8f23cd5c37 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -35,6 +35,8 @@ inline void eeprom_update_int8(unsigned char* addr, int8_t v) { //-// +#define EEPROM_NOZZLE_DIAMETER_uM_DEFAULT 400 + enum class ClPrintChecking:uint_least8_t { _Nozzle=1, From c3b7b5ebb57f0e8f197c195bf70db5cb9217a53b Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 15:58:07 +0300 Subject: [PATCH 155/190] Check fans before resuming --- Firmware/ultralcd.cpp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1d970368a4..574519f28a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6325,6 +6325,39 @@ void lcd_resume_print() lcd_reset_alert_level(); lcd_setstatuspgm(_T(MSG_RESUMING_PRINT)); lcd_reset_alert_level(); //for fan speed error + +#ifdef FANCHECK + fanSpeed = 255; +#ifdef FAN_SOFT_PWM + fanSpeedSoftPwm = 255; +#endif //FAN_SOFT_PWM + manage_heater(); //enables print fan + setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, 1); //force enables the extruder fan untill the first manage_heater() call. +#ifdef FAN_SOFT_PWM + extruder_autofan_last_check = _millis(); + fan_measuring = true; +#endif //FAN_SOFT_PWM + _delay(2000); //delay_keep_alive would turn off extruder fan, because temerature is too low (maybe) + manage_heater(); + fanSpeed = 0; +#ifdef FAN_SOFT_PWM + fanSpeedSoftPwm = 0; +#endif //FAN_SOFT_PWM + manage_heater(); +#ifdef TACH_0 + if (!fan_speed[0]) { //extruder fan error + LCD_ALERTMESSAGERPGM(PSTR("Err: EXTR. FAN ERROR")); + return; + } +#endif +#ifdef TACH_1 + if (!fan_speed[1]) { //print fan error + LCD_ALERTMESSAGERPGM(PSTR("Err: PRINT FAN ERROR")); + return; + } +#endif +#endif //FANCHECK + restore_print_from_ram_and_continue(0.0); pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation refresh_cmd_timeout(); From 14b72d2b468eb7e50e5b310b5c94c0be2dc14258 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 18:12:19 +0300 Subject: [PATCH 156/190] Prevent timeout when printing from SD with USB host connected --- 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 3e1372edbf..f9cfb9005a 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1753,7 +1753,7 @@ void loop() } #ifdef FANCHECK - if ((saved_printing_type == PRINTING_TYPE_USB) && fan_check_error) + if (fan_check_error) { process_commands(); //used to process pausing KEEPALIVE_STATE(PAUSED_FOR_USER); From 532d1fc4ae9ef079982237bce42acbdf01711d1b Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 18:32:35 +0300 Subject: [PATCH 157/190] Fix "Resume Print" missing when doing a normal pause --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 574519f28a..a332911d91 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6513,7 +6513,7 @@ static void lcd_main_menu() else { #ifdef FANCHECK - if(fan_check_error == EFCE_FIXED) + if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT #else MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT From 4d149f0dfa711f35905e606e4666146874b6cdc9 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 18:50:29 +0300 Subject: [PATCH 158/190] Do not send useless keepalive messages after print is canceled from lcd --- 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 f9cfb9005a..10660195a7 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1753,7 +1753,7 @@ void loop() } #ifdef FANCHECK - if (fan_check_error) + if (fan_check_error && isPrintPaused) { process_commands(); //used to process pausing KEEPALIVE_STATE(PAUSED_FOR_USER); From 9c2269282754e430b8b96bdebd889f7eae45ef28 Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 22:34:31 +0300 Subject: [PATCH 159/190] Fix Cancel Print command processing --- Firmware/Marlin_main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 10660195a7..98dff2f9be 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1755,12 +1755,11 @@ void loop() #ifdef FANCHECK if (fan_check_error && isPrintPaused) { - process_commands(); //used to process pausing KEEPALIVE_STATE(PAUSED_FOR_USER); host_keepalive(); //prevent timeouts since usb processing is disabled until print is resumed. This is for a crude way of pausing a print on all hosts. } - else #endif + if (prusa_sd_card_upload) { //we read byte-by byte From dfd3f34351f96a6807e4ca931f9015b3150d6bff Mon Sep 17 00:00:00 2001 From: leptun Date: Wed, 25 Sep 2019 22:35:35 +0300 Subject: [PATCH 160/190] Check for minimum fan speed. Should be achievable by both fans in 1s. --- Firmware/ultralcd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a332911d91..b29d39fb38 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6337,7 +6337,7 @@ void lcd_resume_print() extruder_autofan_last_check = _millis(); fan_measuring = true; #endif //FAN_SOFT_PWM - _delay(2000); //delay_keep_alive would turn off extruder fan, because temerature is too low (maybe) + _delay(1000); //delay_keep_alive would turn off extruder fan, because temerature is too low (maybe) manage_heater(); fanSpeed = 0; #ifdef FAN_SOFT_PWM @@ -6345,13 +6345,13 @@ void lcd_resume_print() #endif //FAN_SOFT_PWM manage_heater(); #ifdef TACH_0 - if (!fan_speed[0]) { //extruder fan error + if (fan_speed[0] <= 20) { //extruder fan error LCD_ALERTMESSAGERPGM(PSTR("Err: EXTR. FAN ERROR")); return; } #endif #ifdef TACH_1 - if (!fan_speed[1]) { //print fan error + if (fan_speed[1] <= 20) { //print fan error LCD_ALERTMESSAGERPGM(PSTR("Err: PRINT FAN ERROR")); return; } From ff9a6c81772ce2735bc47bfe837c6ad625da03ce Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 26 Sep 2019 20:52:29 +0300 Subject: [PATCH 161/190] Prevent fan error while checking fan functionality --- Firmware/temperature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index f88933a191..e1c467287e 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -506,11 +506,11 @@ void checkFanSpeed() fan_check_error = EFCE_FIXED; } - if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled) { + if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) { fan_speed_errors[0] = 0; fanSpeedError(0); //extruder fan } - if ((fan_speed_errors[1] > max_print_fan_errors) && fans_check_enabled) { + if ((fan_speed_errors[1] > max_print_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) { fan_speed_errors[1] = 0; fanSpeedError(1); //print fan } From 8c7015df53312aaf3557b2ac8354289b98556cd1 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 27 Sep 2019 15:42:31 +0200 Subject: [PATCH 162/190] Document set current command. --- Firmware/Marlin_main.cpp | 3 +- Firmware/tmc2130.cpp | 75 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2423beafbe..970b855f7d 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7444,11 +7444,12 @@ SERIAL_PROTOCOLPGM("\n\n"); break; #endif - //! ### M907 - Set digital trimpot motor current using axis codes + //! ### M907 - Set digital trimpot motor current in mA using axis codes // --------------------------------------------------------------- case 907: { #ifdef TMC2130 + //! See tmc2130_cur2val() for translation to 0 .. 63 range for (int i = 0; i < NUM_AXIS; i++) if(code_seen(axis_codes[i])) { diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 15188fc421..42359ba845 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -1,3 +1,5 @@ +//! @file + #include "Marlin.h" #ifdef TMC2130 @@ -1009,6 +1011,79 @@ bool tmc2130_home_calibrate(uint8_t axis) return true; } + +//! @brief Translate current to tmc2130 vsense and IHOLD or IRUN +//! @param cur current in mA +//! @return 0 .. 63 +//! @n most significant bit is CHOPCONF vsense bit (sense resistor voltage based current scaling) +//! @n rest is to be used in IRUN or IHOLD register +//! +//! | mA | trinamic register | note | +//! | --- | --- | --- | +//! | 0 | 0 | doesn't mean current off, lowest current is 1/32 current with vsense low range | +//! | 30 | 1 | | +//! | 40 | 2 | | +//! | 60 | 3 | | +//! | 90 | 4 | | +//! | 100 | 5 | | +//! | 120 | 6 | | +//! | 130 | 7 | | +//! | 150 | 8 | | +//! | 180 | 9 | | +//! | 190 | 10 | | +//! | 210 | 11 | | +//! | 230 | 12 | | +//! | 240 | 13 | | +//! | 250 | 13 | | +//! | 260 | 14 | | +//! | 280 | 15 | | +//! | 300 | 16 | | +//! | 320 | 17 | | +//! | 340 | 18 | | +//! | 350 | 19 | | +//! | 370 | 20 | | +//! | 390 | 21 | | +//! | 410 | 22 | | +//! | 430 | 23 | | +//! | 450 | 24 | | +//! | 460 | 25 | | +//! | 480 | 26 | | +//! | 500 | 27 | | +//! | 520 | 28 | | +//! | 535 | 29 | | +//! | N/D | 30 | extruder default | +//! | 540 | 33 | | +//! | 560 | 34 | | +//! | 580 | 35 | | +//! | 590 | 36 | farm mode extruder default | +//! | 610 | 37 | | +//! | 630 | 38 | | +//! | 640 | 39 | | +//! | 660 | 40 | | +//! | 670 | 41 | | +//! | 690 | 42 | | +//! | 710 | 43 | | +//! | 720 | 44 | | +//! | 730 | 45 | | +//! | 760 | 46 | | +//! | 770 | 47 | | +//! | 790 | 48 | | +//! | 810 | 49 | | +//! | 820 | 50 | | +//! | 840 | 51 | | +//! | 850 | 52 | | +//! | 870 | 53 | | +//! | 890 | 54 | | +//! | 900 | 55 | | +//! | 920 | 56 | | +//! | 940 | 57 | | +//! | 950 | 58 | | +//! | 970 | 59 | | +//! | 980 | 60 | | +//! | 1000 | 61 | | +//! | 1020 | 62 | | +//! | 1029 | 63 | | + uint8_t tmc2130_cur2val(float cur) { if (cur < 0) cur = 0; //limit min From bf09eb943d56cdfc11847324c6ac04976f264b8d Mon Sep 17 00:00:00 2001 From: leptun Date: Sun, 29 Sep 2019 21:09:11 +0300 Subject: [PATCH 163/190] fix workDirDepth not reset after card init. --- Firmware/cardreader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index a9cea244fa..ab4d3776b3 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -203,6 +203,7 @@ void CardReader::initsd() } workDir=root; curDir=&root; + workDirDepth = 0; #ifdef SDCARD_SORT_ALPHA presort(); From 30f325c81d190f24e9582b54f1c80643bb18cf32 Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 30 Sep 2019 20:01:31 +0300 Subject: [PATCH 164/190] Extract fan_error_selftest to function for readability --- Firmware/ultralcd.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b29d39fb38..bd261d4e48 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6316,17 +6316,10 @@ static void lcd_test_menu() } #endif //LCD_TEST -//! @brief Resume paused print -//! @todo It is not good to call restore_print_from_ram_and_continue() from function called by lcd_update(), -//! as restore_print_from_ram_and_continue() calls lcd_update() internally. -void lcd_resume_print() +static void fan_error_selftest() { - lcd_return_to_status(); - lcd_reset_alert_level(); - lcd_setstatuspgm(_T(MSG_RESUMING_PRINT)); - lcd_reset_alert_level(); //for fan speed error - #ifdef FANCHECK + fanSpeed = 255; #ifdef FAN_SOFT_PWM fanSpeedSoftPwm = 255; @@ -6356,7 +6349,21 @@ void lcd_resume_print() return; } #endif -#endif //FANCHECK + +#endif //FANCHECK +} + +//! @brief Resume paused print +//! @todo It is not good to call restore_print_from_ram_and_continue() from function called by lcd_update(), +//! as restore_print_from_ram_and_continue() calls lcd_update() internally. +void lcd_resume_print() +{ + lcd_return_to_status(); + lcd_reset_alert_level(); + lcd_setstatuspgm(_T(MSG_RESUMING_PRINT)); + lcd_reset_alert_level(); //for fan speed error + + fan_error_selftest(); restore_print_from_ram_and_continue(0.0); pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation From 61c74795791f3ec64411e6a4a8c43ae8f1aa448e Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 30 Sep 2019 20:16:01 +0300 Subject: [PATCH 165/190] Code cleanup: Move texts to messages.c/h --- Firmware/Marlin_main.cpp | 2 +- Firmware/messages.c | 3 +++ Firmware/messages.h | 3 +++ Firmware/temperature.cpp | 4 ++-- Firmware/ultralcd.cpp | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 98dff2f9be..39013dc8d5 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -619,7 +619,7 @@ void crashdet_cancel() if (saved_printing_type == PRINTING_TYPE_SD) { lcd_print_stop(); }else if(saved_printing_type == PRINTING_TYPE_USB){ - SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI SERIAL_PROTOCOLLNRPGM(MSG_OK); } } diff --git a/Firmware/messages.c b/Firmware/messages.c index 7803bb358d..c0c3cfc3f0 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -131,3 +131,6 @@ const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix th const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; //// const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; //// const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; //// +const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; //// +const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20 +const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index a6525491dc..525b7c5b4e 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -132,6 +132,9 @@ extern const char MSG_EJECT_FILAMENT[]; extern const char MSG_CUT_FILAMENT[]; extern const char MSG_OCTOPRINT_PAUSED[]; extern const char MSG_OCTOPRINT_RESUMED[]; +extern const char MSG_OCTOPRINT_CANCEL[]; +extern const char MSG_FANCHECK_EXTRUDER[]; +extern const char MSG_FANCHECK_PRINT[]; #if defined(__cplusplus) } diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index e1c467287e..5a1b9c8c28 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -547,10 +547,10 @@ void fanSpeedError(unsigned char _fan) { } switch (_fan) { case 0: // extracting the same code from case 0 and case 1 into a function saves 72B - fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), PSTR("Err: EXTR. FAN ERROR") ); + fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), MSG_FANCHECK_EXTRUDER); break; case 1: - fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") ); + fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), MSG_FANCHECK_PRINT); break; } // SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint. diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bd261d4e48..5214ea59eb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6339,13 +6339,13 @@ static void fan_error_selftest() manage_heater(); #ifdef TACH_0 if (fan_speed[0] <= 20) { //extruder fan error - LCD_ALERTMESSAGERPGM(PSTR("Err: EXTR. FAN ERROR")); + LCD_ALERTMESSAGERPGM(MSG_FANCHECK_EXTRUDER); return; } #endif #ifdef TACH_1 if (fan_speed[1] <= 20) { //print fan error - LCD_ALERTMESSAGERPGM(PSTR("Err: PRINT FAN ERROR")); + LCD_ALERTMESSAGERPGM(MSG_FANCHECK_PRINT); return; } #endif @@ -6883,7 +6883,7 @@ void lcd_print_stop() //-// if(!card.sdprinting) { - SERIAL_ECHOLNPGM("// action:cancel"); // for Octoprint + SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint } saved_printing = false; saved_printing_type = PRINTING_TYPE_NONE; From 9d57f9c365c9999505415233727ee039199f7579 Mon Sep 17 00:00:00 2001 From: leptun Date: Mon, 30 Sep 2019 20:30:09 +0300 Subject: [PATCH 166/190] Fix fan_error_selftest() mistake --- Firmware/ultralcd.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5214ea59eb..a5623fa612 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6316,7 +6316,7 @@ static void lcd_test_menu() } #endif //LCD_TEST -static void fan_error_selftest() +static bool fan_error_selftest() { #ifdef FANCHECK @@ -6340,15 +6340,16 @@ static void fan_error_selftest() #ifdef TACH_0 if (fan_speed[0] <= 20) { //extruder fan error LCD_ALERTMESSAGERPGM(MSG_FANCHECK_EXTRUDER); - return; + return 1; } #endif #ifdef TACH_1 if (fan_speed[1] <= 20) { //print fan error LCD_ALERTMESSAGERPGM(MSG_FANCHECK_PRINT); - return; + return 1; } #endif + return 0; #endif //FANCHECK } @@ -6363,7 +6364,7 @@ void lcd_resume_print() lcd_setstatuspgm(_T(MSG_RESUMING_PRINT)); lcd_reset_alert_level(); //for fan speed error - fan_error_selftest(); + if (fan_error_selftest()) return; //abort if error persists restore_print_from_ram_and_continue(0.0); pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation From 543ad6eb4130a8c1cb47b0a2d96a4b74315e9da1 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 30 Sep 2019 19:58:09 +0200 Subject: [PATCH 167/190] Ask to reset Z offset before first layer calibration. --- Firmware/ultralcd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 77af6d5f49..e352c87416 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4774,6 +4774,12 @@ void lcd_toshiba_flash_air_compatibility_toggle() void lcd_v2_calibration() { + if(lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Start from zero offset?"), false, false))////r=15 + { + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base-> + s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].z_offset)),0xffff); + } + if (mmu_enabled) { const uint8_t filament = choose_menu_P( From 72aed3c544f393653f9c2581eb952b55e9f77f99 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 1 Oct 2019 10:51:02 +0200 Subject: [PATCH 168/190] Allow knob-long-press only in listed menus --- Firmware/ultralcd.cpp | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 77af6d5f49..4812e343af 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8606,7 +8606,6 @@ uint8_t get_message_level() return lcd_status_message_level; } - void menu_lcd_longpress_func(void) { if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z) @@ -8616,15 +8615,41 @@ void menu_lcd_longpress_func(void) return; } + // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions + // The lists are not the same for both functions, so first decide which function is to be performed + // @@TODO - handle full-screen modal dialogs safely - i.e. they should not hang the printer while doing long press 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); - } - else - { - move_menu_scale = 1.0; - menu_submenu(lcd_move_z); + { // long press as live-adj-z + if(menu_menu == lcd_status_screen + || menu_menu == lcd_tune_menu + || menu_menu == lcd_support_menu + ){ + lcd_clear(); + menu_submenu(lcd_babystep_z); + } else { + // otherwise consume the long press as normal click + // consume the loreturns to sheet menu + menu_back(); + } + } else { // long press as move-z + if(menu_menu == lcd_status_screen + || menu_menu == lcd_main_menu + || menu_menu == lcd_preheat_menu + || menu_menu == lcd_sdcard_menu + || menu_menu == lcd_settings_menu + || menu_menu == lcd_control_temperature_menu +#if (LANG_MODE != 0) + || menu_menu == lcd_language +#endif + || menu_menu == lcd_support_menu + ){ + move_menu_scale = 1.0; + menu_submenu(lcd_move_z); + } else { + // otherwise consume the long press as normal click + // consume the loreturns to sheet menu + menu_back(); + } } } From 9ae75612b57661b3db55131179df6a3a8d7cc569 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 1 Oct 2019 15:31:01 +0200 Subject: [PATCH 169/190] Fixes after first feature tests --- Firmware/ultralcd.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4812e343af..a966c81f61 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8618,11 +8618,13 @@ void menu_lcd_longpress_func(void) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // The lists are not the same for both functions, so first decide which function is to be performed // @@TODO - handle full-screen modal dialogs safely - i.e. they should not hang the printer while doing long press - if (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU && (moves_planned() || IS_SD_PRINTING || is_usb_printing )) - { // long press as live-adj-z - if(menu_menu == lcd_status_screen - || menu_menu == lcd_tune_menu - || menu_menu == lcd_support_menu + if ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z + if(( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height + && ( menu_menu == lcd_status_screen // and in listed menus... + || menu_menu == lcd_main_menu + || menu_menu == lcd_tune_menu + || menu_menu == lcd_support_menu + ) ){ lcd_clear(); menu_submenu(lcd_babystep_z); From ed13788e0caf032bc8a3ab3f8db9a25ad138c67d Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Tue, 1 Oct 2019 16:57:37 +0200 Subject: [PATCH 170/190] EEPROM_BABYSTEP_Z using removal --- Firmware/Marlin_main.cpp | 9 +++++---- Firmware/eeprom.cpp | 2 +- Firmware/eeprom.h | 8 ++++++-- Firmware/ultralcd.cpp | 15 +++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 970b855f7d..2251b7e357 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1527,7 +1527,7 @@ void setup() calibration_status() == CALIBRATION_STATUS_UNKNOWN || calibration_status() == CALIBRATION_STATUS_XYZ_CALIBRATION) { // Reset the babystepping values, so the printer will not move the Z axis up when the babystepping is enabled. - eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, 0); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)),0); // Show the message. lcd_show_fullscreen_message_and_wait_P(_T(MSG_FOLLOW_CALIBRATION_FLOW)); } @@ -2694,6 +2694,7 @@ static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, lon previous_millis_cmd = _millis(); endstops_hit_on_purpose(); #ifndef MESH_BED_LEVELING +//-// Oct 2019 :: this part of code is (from) now probably un-compilable // If MESH_BED_LEVELING is not active, then it is the original Prusa i3. // Offer the user to load the baby step value, which has been adjusted at the previous print session. if(card.sdprinting && eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z)) @@ -2886,7 +2887,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level) { // Reset the baby step value and the baby step applied flag. calibration_status_store(CALIBRATION_STATUS_XYZ_CALIBRATION); - eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, 0); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)),0); // Complete XYZ calibration. uint8_t point_too_far_mask = 0; BedSkewOffsetDetectionResultType result = find_bed_offset_and_skew(verbosity_level, point_too_far_mask); @@ -3736,7 +3737,7 @@ void process_commands() lang_reset(); } else if(code_seen("Lz")) { // PRUSA Lz - EEPROM_save_B(EEPROM_BABYSTEP_Z,0); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)),0); } else if(code_seen("Beat")) { // PRUSA Beat // Kick farm link timer @@ -5507,7 +5508,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // Reset the baby step value and the baby step applied flag. calibration_status_store(CALIBRATION_STATUS_ASSEMBLED); - eeprom_update_word((uint16_t*)EEPROM_BABYSTEP_Z, 0); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)),0); // Reset the skew and offset in both RAM and EEPROM. reset_bed_offset_and_skew(); diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index b33b2c3ca4..93098e93be 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -62,7 +62,7 @@ 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) + if (eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)) == EEPROM_EMPTY_VALUE) { eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), 0); // When upgrading from version older version (before multiple sheets were implemented in v3.8.0) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 482ddf932c..197c18c25b 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -3,9 +3,12 @@ #include +#define MAX_SHEETS 8 +#define MAX_SHEET_NAME_LENGTH 7 + typedef struct { - char name[7]; //!< Can be null terminated, doesn't need to be null terminated + char name[MAX_SHEET_NAME_LENGTH]; //!< Can be null terminated, doesn't need to be null terminated int16_t z_offset; //!< Z_BABYSTEP_MIN .. Z_BABYSTEP_MAX = Z_BABYSTEP_MIN*2/1000 [mm] .. Z_BABYSTEP_MAX*2/1000 [mm] uint8_t bed_temp; //!< 0 .. 254 [°C] uint8_t pinda_temp; //!< 0 .. 254 [°C] @@ -13,7 +16,7 @@ typedef struct typedef struct { - Sheet s[8]; + Sheet s[MAX_SHEETS]; uint8_t active_sheet; } Sheets; // sizeof(Sheets). Do not change it unless EEPROM_Sheets_base is last item in EEPROM. @@ -25,6 +28,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #endif #define EEPROM_EMPTY_VALUE 0xFF +#define EEPROM_EMPTY_VALUE16 0xFFFF // The total size of the EEPROM is // 4096 for the Atmega2560 #define EEPROM_TOP 4096 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 77af6d5f49..6bd834fb72 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3211,15 +3211,10 @@ static void lcd_babystep_z() if (LCD_CLICKED || menu_leaving) { // Only update the EEPROM when leaving the menu. - eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base-> - s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)), - _md->babystepMemZ); - eeprom_update_byte(&(EEPROM_Sheets_base->s[(eeprom_read_byte( - &(EEPROM_Sheets_base->active_sheet)))].bed_temp), - target_temperature_bed); - eeprom_update_byte(&(EEPROM_Sheets_base->s[(eeprom_read_byte( - &(EEPROM_Sheets_base->active_sheet)))].pinda_temp), - current_temperature_pinda); + uint8_t active_sheet=eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[active_sheet].z_offset)),_md->babystepMemZ); + eeprom_update_byte(&(EEPROM_Sheets_base->s[active_sheet].bed_temp),target_temperature_bed); + eeprom_update_byte(&(EEPROM_Sheets_base->s[active_sheet].pinda_temp),current_temperature_pinda); calibration_status_store(CALIBRATION_STATUS_CALIBRATED); } if (LCD_CLICKED) menu_back(); @@ -6649,7 +6644,7 @@ static void lcd_reset_sheet() { SheetName sheetName; eeprom_default_sheet_name(selected_sheet, sheetName); - eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),0xffff); + eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[selected_sheet].z_offset)),EEPROM_EMPTY_VALUE16); 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))) { From f3c3526aa5cdf49df526e2a2660d2ee43535112c Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 1 Oct 2019 17:13:36 +0200 Subject: [PATCH 171/190] fix the knob long-press causing hang in modal dialogs --- Firmware/lcd.cpp | 3 +-- Firmware/ultralcd.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 71948789bb..3e39312c19 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -761,8 +761,7 @@ void lcd_buttons_update(void) //else if (menu_menu == lcd_move_z) lcd_quick_feedback(); //lcd_button_pressed is set back to false via lcd_quick_feedback function } - else - lcd_long_press_active = 0; + lcd_long_press_active = 0; } lcd_buttons = newbutton; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a966c81f61..ac0067d06f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8617,7 +8617,6 @@ void menu_lcd_longpress_func(void) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // The lists are not the same for both functions, so first decide which function is to be performed - // @@TODO - handle full-screen modal dialogs safely - i.e. they should not hang the printer while doing long press if ( (moves_planned() || IS_SD_PRINTING || is_usb_printing )){ // long press as live-adj-z if(( current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU ) // only allow live-adj-z up to 2mm of print height && ( menu_menu == lcd_status_screen // and in listed menus... @@ -8630,8 +8629,8 @@ void menu_lcd_longpress_func(void) menu_submenu(lcd_babystep_z); } else { // otherwise consume the long press as normal click - // consume the loreturns to sheet menu - menu_back(); + if( menu_menu != lcd_status_screen ) + menu_back(); } } else { // long press as move-z if(menu_menu == lcd_status_screen @@ -8649,8 +8648,8 @@ void menu_lcd_longpress_func(void) menu_submenu(lcd_move_z); } else { // otherwise consume the long press as normal click - // consume the loreturns to sheet menu - menu_back(); + if( menu_menu != lcd_status_screen ) + menu_back(); } } } From 7c3f397a6240aba9bb7bf3cc9cb0617013f868bb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 1 Oct 2019 18:22:12 +0200 Subject: [PATCH 172/190] Print sheet name and Z offset in first layer calibration reset dialog. --- Firmware/ultralcd.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e352c87416..4038cb3eb1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4772,6 +4772,17 @@ void lcd_toshiba_flash_air_compatibility_toggle() eeprom_update_byte((uint8_t*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY, card.ToshibaFlashAir_isEnabled()); } +void lcd_first_layer_calibration_reset() +{ + SheetFormatBuffer buffer; + menu_format_sheet_E(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))], buffer); + lcd_set_cursor(0, 0); + lcd_print(buffer.c); + lcd_set_cursor(0, 1); + float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; + lcd_printf_P(PSTR("%.14S%+5.3f"), _i("Adjusting Z:"), offset); //// c=14 +} + void lcd_v2_calibration() { if(lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Start from zero offset?"), false, false))////r=15 @@ -5751,7 +5762,7 @@ static void lcd_calibration_menu() if (!isPrintPaused) { MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1 - MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_v2_calibration); + MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_first_layer_calibration_reset); MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W")); MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST #ifdef MK1BP @@ -6673,7 +6684,7 @@ static void lcd_reset_sheet() static void activate_calibrate_sheet() { eeprom_update_byte(&(EEPROM_Sheets_base->active_sheet), selected_sheet); - lcd_v2_calibration(); + lcd_first_layer_calibration_reset(); } static void lcd_sheet_menu() From 6bd35bfa2f37a4d79185a647d3b39bb76f01bc0e Mon Sep 17 00:00:00 2001 From: leptun Date: Tue, 1 Oct 2019 19:43:30 +0300 Subject: [PATCH 173/190] Increase MENU_DEPTH_MAX to 7 to allow sheet calibration with MMU --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 352191024b..d8232c321e 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -15,7 +15,7 @@ extern int32_t lcd_encoder; -#define MENU_DEPTH_MAX 6 +#define MENU_DEPTH_MAX 7 static menu_record_t menu_stack[MENU_DEPTH_MAX]; From aabf7655dcb5dcd6ac0aee3df4072cbcbbfcfd3f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 1 Oct 2019 19:20:36 +0200 Subject: [PATCH 174/190] Do all text formatting in first layer calibration reset dialog in one line. --- Firmware/ultralcd.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4038cb3eb1..b5527f98e0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4774,13 +4774,12 @@ void lcd_toshiba_flash_air_compatibility_toggle() void lcd_first_layer_calibration_reset() { - SheetFormatBuffer buffer; - menu_format_sheet_E(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))], buffer); + + char sheet_name[7]; + eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, 7); lcd_set_cursor(0, 0); - lcd_print(buffer.c); - lcd_set_cursor(0, 1); float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; - lcd_printf_P(PSTR("%.14S%+5.3f"), _i("Adjusting Z:"), offset); //// c=14 + lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f\n%cContinue\n%cStart from zero"), sheet_name, offset); //// r=4 } void lcd_v2_calibration() From 087d3cb25032c1cd5b7b0d230cbe9af0663351ff Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 1 Oct 2019 21:04:00 +0200 Subject: [PATCH 175/190] Continue to lcd_v2_calibration() after selection is made in lcd_first_layer_calibration_reset(). Do not ask for selection if sheet is not calibrated, it is calibrated to zero offset or no first layer calibration was ever made. --- Firmware/ultralcd.cpp | 54 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b5527f98e0..0630eb7c17 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -130,6 +130,7 @@ static void lcd_menu_xyz_offset(); static void lcd_menu_fails_stats_mmu(); static void lcd_menu_fails_stats_mmu_print(); static void lcd_menu_fails_stats_mmu_total(); +static void lcd_v2_calibration(); //static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") static void mmu_fil_eject_menu(); @@ -4772,24 +4773,59 @@ void lcd_toshiba_flash_air_compatibility_toggle() eeprom_update_byte((uint8_t*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY, card.ToshibaFlashAir_isEnabled()); } +//! @brief Continue first layer calibration with previous value or start from zero? +//! +//! @code{.unparsed} +//! |01234567890123456789| +//! |Sheet Smooth1 actual| c=a, c=b, a+b = 13 +//! |Z offset: -1.480 mm | c=a, c=b, a+b = 14 +//! |>Continue | c=19 +//! | Start from zero | c=19 +//! ---------------------- +//! @endcode void lcd_first_layer_calibration_reset() { + typedef struct + { + bool reset; + } MenuData; + static_assert(sizeof(menu_data)>= sizeof(MenuData),"_menu_data_t doesn't fit into menu_data"); + MenuData* menuData = (MenuData*)&(menu_data[0]); + + if(LCD_CLICKED || !eeprom_is_sheet_initialized(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))) || + (calibration_status() >= CALIBRATION_STATUS_LIVE_ADJUST) || + (0 == static_cast(eeprom_read_word(reinterpret_cast + (&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset))))) + { + if (menuData->reset) + { + eeprom_update_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset), 0xffff); + } + menu_goto(lcd_v2_calibration,0,true,true); + } - char sheet_name[7]; - eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, 7); + if (lcd_encoder > 0) + { + menuData->reset = true; + lcd_encoder = 1; + } + else if (lcd_encoder < 1) + { + menuData->reset = false; + lcd_encoder = 0; + } + + char sheet_name[sizeof(Sheet::name)]; + eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); lcd_set_cursor(0, 0); float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; - lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f\n%cContinue\n%cStart from zero"), sheet_name, offset); //// r=4 + lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 + sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); + } void lcd_v2_calibration() { - if(lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Start from zero offset?"), false, false))////r=15 - { - eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base-> - s[eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))].z_offset)),0xffff); - } - if (mmu_enabled) { const uint8_t filament = choose_menu_P( From ca9ef3aba123e45b792bddc4eace803ffedfd455 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 1 Oct 2019 22:57:15 +0200 Subject: [PATCH 176/190] Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset. --- Firmware/ultralcd.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0630eb7c17..9f498e01a7 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4777,10 +4777,10 @@ void lcd_toshiba_flash_air_compatibility_toggle() //! //! @code{.unparsed} //! |01234567890123456789| -//! |Sheet Smooth1 actual| c=a, c=b, a+b = 13 -//! |Z offset: -1.480 mm | c=a, c=b, a+b = 14 -//! |>Continue | c=19 -//! | Start from zero | c=19 +//! |[Smooth1]Live adj. Z| c=11 +//! |value set, continue | c=20 +//! |or start from zero? | c=20 +//! |>Continue Reset | c=a, c=b, a+b = 18 //! ---------------------- //! @endcode void lcd_first_layer_calibration_reset() @@ -4818,9 +4818,8 @@ void lcd_first_layer_calibration_reset() char sheet_name[sizeof(Sheet::name)]; eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); lcd_set_cursor(0, 0); - float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; - lcd_printf_P(_i("Sheet %.7s actual\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 - sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); + lcd_printf_P(_i("[%.7s]Live adj. Z\nvalue set, continue\nor start from zero?\n%cContinue%cReset"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 + sheet_name, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); } From 7feb763643d008786190804507b1deed6aa48029 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 2 Oct 2019 18:38:46 +0200 Subject: [PATCH 177/190] Move check for clear EEPROM just after factory_reset() to ensure nothing is written to EEPROM before check. Fix wizard not starting after Factory RESET / All Data on MK25 printer. This was broken by: Author: leptun Date: 3 weeks ago (9/12/2019 6:16:31 AM) Commit hash: 78708903e83dfa0f9353e8a2083731b158281249 Also update eeprom value --- Firmware/Marlin_main.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6d48686c7c..45dd118c42 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1234,6 +1234,21 @@ void setup() plan_init(); // Initialize planner; factory_reset(); + if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && + eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff) + { + // Maiden startup. The firmware has been loaded and first started on a virgin RAMBo board, + // where all the EEPROM entries are set to 0x0ff. + // Once a firmware boots up, it forces at least a language selection, which changes + // EEPROM_LANG to number lower than 0x0ff. + // 1) Set a high power mode. +#ifdef TMC2130 + eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); + tmc2130_mode = TMC2130_MODE_NORMAL; +#endif //TMC2130 + eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard + } + lcd_encoder_diff=0; #ifdef TMC2130 @@ -1345,20 +1360,6 @@ void setup() // Enable Toshiba FlashAir SD card / WiFi enahanced card. card.ToshibaFlashAir_enable(eeprom_read_byte((unsigned char*)EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY) == 1); - if (eeprom_read_dword((uint32_t*)(EEPROM_TOP - 4)) == 0x0ffffffff && - eeprom_read_dword((uint32_t*)(EEPROM_TOP - 8)) == 0x0ffffffff) { - // Maiden startup. The firmware has been loaded and first started on a virgin RAMBo board, - // where all the EEPROM entries are set to 0x0ff. - // Once a firmware boots up, it forces at least a language selection, which changes - // EEPROM_LANG to number lower than 0x0ff. - // 1) Set a high power mode. -#ifdef TMC2130 - eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); - tmc2130_mode = TMC2130_MODE_NORMAL; -#endif //TMC2130 - eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard - } - // Force SD card update. Otherwise the SD card update is done from loop() on card.checkautostart(false), // but this times out if a blocking dialog is shown in setup(). card.initsd(); From 90c2c65566e3006b1b8ade80bc07c28e207b0e5e Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 3 Oct 2019 15:43:58 +0200 Subject: [PATCH 178/190] tiny lang fixes for 3.8.1 --- lang/lang_en.txt | 3 +++ lang/lang_en_cz.txt | 4 ++++ lang/lang_en_de.txt | 6 +++++- lang/lang_en_es.txt | 10 +++++++--- lang/lang_en_fr.txt | 10 +++++++--- lang/lang_en_it.txt | 8 ++++++-- lang/lang_en_pl.txt | 4 ++++ 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c9346b2b54..a7756bfe00 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,3 +1,6 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d3b004b185..64673af424 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index ff4edab799..0aec39d122 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " von 4" @@ -852,7 +856,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]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 19900fad9a..3f6007c883 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " de 4" @@ -812,7 +816,7 @@ # "Print FAN" -"Vent.extr" +"Vent. extr" #MSG_PRUSA3D "prusa3d.com" @@ -1052,11 +1056,11 @@ # "Total filament" -"Filamento total:" +"Filamento total" # "Total print time" -"Tiempo total :" +"Tiempo total" #MSG_TUNE "Tune" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 216abda1e8..729778c272 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,10 +1,14 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" -"de 4" +" de 4" #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" -"de 9" +" de 9" #MSG_MEASURED_OFFSET "[0;0] point offset" @@ -872,7 +876,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [flshAir]" -"CarteSD [flshAir]" +"Carte SD[flshAir]" # "Right" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bf97481108..4d175221fa 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,10 +1,14 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " su 4" #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" -"su 9" +" su 9" #MSG_MEASURED_OFFSET "[0;0] point offset" @@ -492,7 +496,7 @@ #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" -"Sinistra [um]" +"Sinistra [um]" # "Lin. correction" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 9425da7fe0..9e6d8e707a 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,3 +1,7 @@ +# +"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +"[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" From 4fc4cf9c11d03d405d004f50a12039e0d3084270 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 3 Oct 2019 17:30:14 +0200 Subject: [PATCH 179/190] Increase version and commit number. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index d3544c93f8..42bc34106e 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 2684 +#define FW_VERSION "3.8.1" +#define FW_COMMIT_NR 2849 // 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 0dde5e316751f3c722321ca1fc07f8f86724cb4e Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 3 Oct 2019 17:37:22 +0200 Subject: [PATCH 180/190] Increase version. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 42bc34106e..87b5023f91 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.1" -#define FW_COMMIT_NR 2849 +#define FW_VERSION "3.8.1-RC1" +#define FW_COMMIT_NR 2851 // 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 219a5e06251443f8a379143ea8222b6e5adad494 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 3 Oct 2019 21:25:52 +0200 Subject: [PATCH 181/190] Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers and make it more clear. --- Firmware/Marlin_main.cpp | 2 +- Firmware/stepper.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 45dd118c42..bcbe87422b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1242,8 +1242,8 @@ void setup() // Once a firmware boots up, it forces at least a language selection, which changes // EEPROM_LANG to number lower than 0x0ff. // 1) Set a high power mode. + eeprom_update_byte((uint8_t*)EEPROM_SILENT, SILENT_MODE_OFF); #ifdef TMC2130 - eeprom_write_byte((uint8_t*)EEPROM_SILENT, 0); tmc2130_mode = TMC2130_MODE_NORMAL; #endif //TMC2130 eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 710b135ec7..52fedcde9b 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1564,10 +1564,6 @@ void st_current_init() //Initialize Digipot Motor Current { #ifdef MOTOR_CURRENT_PWM_XY_PIN uint8_t SilentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); - if (SilentMode == 0xff){ //set power to High Power (MK2.5) or Normal Power (MK3, unused) - SilentMode = SILENT_MODE_POWER; - eeprom_update_byte((uint8_t*)EEPROM_SILENT, SilentMode); - } SilentModeMenu = SilentMode; pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT); pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT); From e3ac2e2509aa01e06b112af77efa42724f94547e Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 10 Oct 2019 19:01:57 +0300 Subject: [PATCH 182/190] PSU_DELTA fix force_high_power_mode() --- Firmware/Marlin_main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 45dd118c42..816a57dc22 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2433,6 +2433,9 @@ void ramming() { #ifdef TMC2130 void force_high_power_mode(bool start_high_power_section) { +#ifdef PSU_Delta + if (start_high_power_section == true) enable_force_z(); +#endif //PSU_Delta uint8_t silent; silent = eeprom_read_byte((uint8_t*)EEPROM_SILENT); if (silent == 1) { From 04bfe674df36ed985faed0e80a68073d2024c62a Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 16 Oct 2019 16:32:49 +0200 Subject: [PATCH 183/190] tiny lang fixes, part 1 --- Firmware/ultralcd.cpp | 21 ++++++++++++--------- lang/lang_en_cz.txt | 2 +- lang/lang_en_es.txt | 4 ++-- lang/lang_en_pl.txt | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f49528025e..d111489745 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1843,8 +1843,8 @@ static void lcd_menu_fails_stats_total() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Power failures: 000| c=14 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Power failures 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- //! @endcode @@ -1890,6 +1890,7 @@ static void lcd_menu_fails_stats() } #elif defined(FILAMENT_SENSOR) +static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-16.16S%-3d\n"; //! //! @brief Print last print and total filament run outs //! @@ -1900,9 +1901,9 @@ static void lcd_menu_fails_stats() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! |Total failures | c=20 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1912,11 +1913,13 @@ static void lcd_menu_fails_stats() uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); lcd_home(); - lcd_printf_P(PSTR("Last print failures\n" ////c=20 r=1 - " Filam. runouts %-3d\n" ////c=14 r=1 - "Total failures\n" ////c=20 r=1 - " Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=14 r=1 - menu_back_if_clicked(); + lcd_printf_P(failStatsFmt, + _i("Last print failures"), ////c=20 r=1 + _i("Filam. runouts"), filamentLast, ////c=14 r=1 + _i("Total failures"), ////c=20 r=1 + _i("Filam. runouts"), filamentTotal); ////c=14 r=1 + + menu_back_if_clicked(); } #else static void lcd_menu_fails_stats() diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 64673af424..c25c94644d 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." +"Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3f6007c883..4a6006af7a 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -72,11 +72,11 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." +"La carga automatica solo funciona si el sensor de filamento esta activado..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -"La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." +"La carga automatica esta activada, pulse el dial e inserte el filamento..." #MSG_SELFTEST_AXIS_LENGTH "Axis length" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 9e6d8e707a..a8aa9f7499 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." +"Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." From ace1d7049aeb0066083d469a0b007401e8fd1fe9 Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 17 Oct 2019 17:49:15 +0300 Subject: [PATCH 184/190] Reenable command processing when issue is fixed if printer not active --- Firmware/temperature.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5a1b9c8c28..99b07a265c 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -505,7 +505,9 @@ void checkFanSpeed() // we may even send some info to the LCD from here fan_check_error = EFCE_FIXED; } - + if ((fan_check_error == EFCE_FIXED) && !PRINTER_ACTIVE){ + fan_check_error = EFCE_OK; //if the issue is fixed while the printer is doing nothing, reenable processing immediately. + } if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) { fan_speed_errors[0] = 0; fanSpeedError(0); //extruder fan From d432c3644db4e57ba7d3054da9cbbdf635a5ab07 Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 18 Oct 2019 09:13:19 +0300 Subject: [PATCH 185/190] Enable beeping after fan error is fixed --- Firmware/temperature.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 38d3ab7e87..cde7cd88e9 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -507,6 +507,7 @@ void checkFanSpeed() } if ((fan_check_error == EFCE_FIXED) && !PRINTER_ACTIVE){ fan_check_error = EFCE_OK; //if the issue is fixed while the printer is doing nothing, reenable processing immediately. + lcd_reset_alert_level(); //for another fan speed error } if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled && (fan_check_error == EFCE_OK)) { fan_speed_errors[0] = 0; From d32fd1d893305baac0d7cd2894a5fa4e6ec22023 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 22 Oct 2019 09:11:47 +0200 Subject: [PATCH 186/190] Better EN for new messages --- Firmware/ultralcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d111489745..d08f536c15 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4932,12 +4932,12 @@ static void lcd_wizard_load() { if (mmu_enabled) { - lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the first tube of MMU, then press the knob to load it."));////c=20 r=8 + lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////c=20 r=8 tmp_extruder = 0; } else { - lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament to the extruder, then press knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8 + lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8 } lcd_update_enable(false); lcd_clear(); @@ -4961,7 +4961,7 @@ static void wizard_lay1cal_message(bool cold) if (mmu_enabled) { lcd_show_fullscreen_message_and_wait_P( - _i("First you will select filament you wish to use for calibration. Then select temperature which matches your material.")); + _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu.")); } else if (cold) { @@ -4969,7 +4969,7 @@ static void wizard_lay1cal_message(bool cold) _i("Select temperature which matches your material.")); } lcd_show_fullscreen_message_and_wait_P( - _i("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.")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12 + _i("The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter).")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12 } //! @brief Printer first run wizard (Selftest and calibration) @@ -5097,7 +5097,7 @@ void lcd_wizard(WizState state) setTargetBed(PLA_PREHEAT_HPB_TEMP); if (mmu_enabled) { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is any filament loaded?"), true);////c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////c=20 r=2 } else { wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 @@ -5142,7 +5142,7 @@ void lcd_wizard(WizState state) } else { - lcd_show_fullscreen_message_and_wait_P(_i("If you have more steel sheets you can calibrate additional presets in Settings / HW Setup / Steel sheets.")); + lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets.")); state = S::Finish; } break; From 939957aa522f6464257148ddf6b3bab51259d574 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 23 Oct 2019 12:44:11 +0200 Subject: [PATCH 187/190] translations for new text messages --- lang/lang-add.sh | 2 +- lang/lang_en.txt | 27 ++++++++++++++++++++++++--- lang/lang_en_cz.txt | 36 ++++++++++++++++++++++++++++++++---- lang/lang_en_de.txt | 37 ++++++++++++++++++++++++++++++++----- lang/lang_en_es.txt | 36 ++++++++++++++++++++++++++++++++---- lang/lang_en_fr.txt | 36 ++++++++++++++++++++++++++++++++---- lang/lang_en_it.txt | 36 ++++++++++++++++++++++++++++++++---- lang/lang_en_pl.txt | 36 ++++++++++++++++++++++++++++++++---- 8 files changed, 217 insertions(+), 29 deletions(-) diff --git a/lang/lang-add.sh b/lang/lang-add.sh index f8031e19d1..0b63a46227 100755 --- a/lang/lang-add.sh +++ b/lang/lang-add.sh @@ -51,7 +51,7 @@ if ! [ -e lang_add.txt ]; then fi cat lang_add.txt | sed 's/^/"/;s/$/"/' | while read new_s; do - if grep "$new_s" lang_en.txt >/dev/nul; then + if grep "$new_s" lang_en.txt >/dev/null; then echo "text already exist:" echo "$new_s" echo diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a7756bfe00..b1f952aa1d 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -133,6 +133,9 @@ #MSG_CRASHDETECT_ON "Crash det. [on]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" @@ -361,6 +364,9 @@ # "Last print failures" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." + # "Last print" @@ -613,6 +619,15 @@ # "Print FAN" +# +"Please insert filament into the extruder, then press the knob to load it." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." + +# +"Please load filament first." + #MSG_PRUSA3D "prusa3d.com" @@ -688,9 +703,6 @@ # "Select nozzle preheat temperature which matches your material." -# -"Select PLA filament:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" @@ -763,12 +775,18 @@ #MSG_SELFTEST_SWAPPED "Swapped" +# +"Select filament:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" +# +"Select temperature which matches your material." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" @@ -904,6 +922,9 @@ # "Y distance from min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." + # "Y-correct:" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index c25c94644d..7849ddde81 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Crash det. [zap]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "\x00" @@ -482,6 +486,10 @@ "Last print failures" "Selhani posl. tisku" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" + # "Last print" "Posledni tisk" @@ -818,6 +826,18 @@ "Print FAN" "Tiskovy vent." +# +"Please insert filament into the extruder, then press the knob to load it." +"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" + +# +"Please load filament first." +"Prosim nejdriv zavedte filament" + #MSG_PRUSA3D "prusa3d.com" "\x00" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." -# -"Select PLA filament:" -"Vyberte PLA filament:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Nastavte teplotu:" @@ -1018,6 +1034,10 @@ "Swapped" "Prohozene" +# +"Select filament:" +"Zvolte filament:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Tepl. kal. " @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Tepl. kal. [zap]" +# +"Select temperature which matches your material." +"Zvolte teplotu, ktera odpovida vasemu materialu." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Tepl. kal. [vyp]" @@ -1206,6 +1230,10 @@ "Y distance from min" "Y vzdalenost od min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." + # "Y-correct:" "Korekce Y:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 0aec39d122..e3be10061a 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Crash Erk. [an]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "Crash Erk. [nv]" @@ -482,6 +486,10 @@ "Last print failures" "Letzte Druckfehler" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." + # "Last print" "Letzter Druck" @@ -818,6 +826,18 @@ "Print FAN" "Druckvent." +# +"Please insert filament into the extruder, then press the knob to load it." +"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." + +# +"Please load filament first." +"Bitte laden Sie zuerst das Filament." + #MSG_PRUSA3D "prusa3d.com" "\x00" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." -# -"Select PLA filament:" -"PLA Filament auswaehlen:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Temp. einstellen:" @@ -1018,6 +1034,10 @@ "Swapped" "Ausgetauscht" +# +"Select filament:" +"Filament auswaehlen:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Temp Kalib. " @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Temp. Kal. [an]" +# +"Select temperature which matches your material." +"Waehlen Sie die Temperatur, die zu Ihrem Material passt." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Temp. Kal. [aus]" @@ -1202,11 +1226,14 @@ "XYZ calibration failed. Right front calibration point not reachable." "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." - # "Y distance from min" "Y Entfernung vom Min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)." + # "Y-correct:" "Y-Korrektur:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 4a6006af7a..1790e8020e 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Det. choque [act]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "Dec. choque [N/D]" @@ -482,6 +486,10 @@ "Last print failures" "Ultimas impresiones fallidas" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." + # "Last print" "Ultima impresion" @@ -818,6 +826,18 @@ "Print FAN" "Vent. extr" +# +"Please insert filament into the extruder, then press the knob to load it." +"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." + +# +"Please load filament first." +"Por favor, cargar primero el filamento. " + #MSG_PRUSA3D "prusa3d.com" "prusa3d.es" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " -# -"Select PLA filament:" -"Seleccionar filamento PLA:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Establecer temp.:" @@ -1018,6 +1034,10 @@ "Swapped" "Intercambiado" +# +"Select filament:" +"Selecciona filamento:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Cal. temp. " @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Cal. temp. [on]" +# +"Select temperature which matches your material." +"Selecciona la temperatura adecuada a tu material." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Cal. temp. [off]" @@ -1206,6 +1230,10 @@ "Y distance from min" "Distancia en Y desde el min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"La impresora comenzara a imprimir una linea en zig-zag. Gira el dial hasta que la linea alcance la altura optima. Mira las fotos del manual (Capitulo de calibracion)." + # "Y-correct:" "Corregir-Y:" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 729778c272..1a292d2804 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Detect.crash [on]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "Detect.crash[N/A]" @@ -482,6 +486,10 @@ "Last print failures" "Echecs derniere imp." +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Feuilles d'acier." + # "Last print" "Derniere impres." @@ -818,6 +826,18 @@ "Print FAN" "Vent. impr" +# +"Please insert filament into the extruder, then press the knob to load it." +"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." + +# +"Please load filament first." +"Veuillez d'abord charger un filament." + #MSG_PRUSA3D "prusa3d.com" "\x00" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." -# -"Select PLA filament:" -"Selectionnez le fil. PLA:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Regler temp.:" @@ -1018,6 +1034,10 @@ "Swapped" "Echange" +# +"Select filament:" +"Selectionnez le filament:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Calib. Temp." @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Calib. Temp. [on]" +# +"Select temperature which matches your material." +"Selectionnez la temperature qui correspond a votre materiau." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Calib. Temp.[off]" @@ -1206,6 +1230,10 @@ "Y distance from min" "Distance Y du min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)." + # "Y-correct:" "Correct-Y:" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4d175221fa..60a8a2ca83 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Rileva.crash [on]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "Rileva.crash[N/A]" @@ -482,6 +486,10 @@ "Last print failures" "Fallimenti ultima stampa" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." + # "Last print" "Ultima stampa" @@ -818,6 +826,18 @@ "Print FAN" "Ventola di stampa" +# +"Please insert filament into the extruder, then press the knob to load it." +"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." + +# +"Please load filament first." +"Per favore prima carica il filamento." + #MSG_PRUSA3D "prusa3d.com" "\x00" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." -# -"Select PLA filament:" -"Selezionate filamento PLA:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Imposta temperatura:" @@ -1018,6 +1034,10 @@ "Swapped" "Scambiato" +# +"Select filament:" +"Seleziona il filamento:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Calib. temp. " @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Calib. temp. [on]" +# +"Select temperature which matches your material." +"Seleziona la temperatura appropriata per il tuo materiale." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Calib. temp.[off]" @@ -1206,6 +1230,10 @@ "Y distance from min" "Distanza Y dal min" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):" + # "Y-correct:" "Correzione-Y:" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a8aa9f7499..0afdd7bfec 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -178,6 +178,10 @@ "Crash det. [on]" "Wykr.zderzen [wl]" +# +"Choose a filament for the First Layer Calibration and select it in the on-screen menu." +"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." + #MSG_CRASHDETECT_NA "Crash det. [N/A]" "Wykr.zderzen[N/D]" @@ -482,6 +486,10 @@ "Last print failures" "Ostatnie bledy druku" +# +"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +"Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." + # "Last print" "Ost. wydruk" @@ -818,6 +826,18 @@ "Print FAN" "WentWydruk" +# +"Please insert filament into the extruder, then press the knob to load it." +"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." + +# +"Please insert filament into the first tube of the MMU, then press the knob to load it." +"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." + +# +"Please load filament first." +"Najpierw zaladuj filament." + #MSG_PRUSA3D "prusa3d.com" "\x00" @@ -918,10 +938,6 @@ "Select nozzle preheat temperature which matches your material." "Wybierz temperature grzania dyszy odpowiednia dla materialu." -# -"Select PLA filament:" -"Wybierz filament PLA:" - #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" "Ustaw temperature:" @@ -1018,6 +1034,10 @@ "Swapped" "Zamieniono" +# +"Select filament:" +"Wybierz filament:" + #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " "Kalibracja temp." @@ -1026,6 +1046,10 @@ "Temp. cal. [on]" "Kalibr.temp. [wl]" +# +"Select temperature which matches your material." +"Wybierz temperature, ktora odpowiada Twojemu filamentowi." + #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" "Kalibr.temp.[wyl]" @@ -1206,6 +1230,10 @@ "Y distance from min" "Dystans od 0 w osi Y" +# +"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." +"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." + # "Y-correct:" "Korekcja-Y:" From 5c2b573415a19d57353463856017919e7376ffac Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 23 Oct 2019 13:54:15 +0200 Subject: [PATCH 188/190] Skipped one translated sentence, because total translation size was > 65535B. --- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7849ddde81..c362b3f6b3 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." +"\x00" # "Y-correct:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index e3be10061a..90181ebf39 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)." +"\x00" # "Y-correct:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1790e8020e..efb3a85bbd 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"La impresora comenzara a imprimir una linea en zig-zag. Gira el dial hasta que la linea alcance la altura optima. Mira las fotos del manual (Capitulo de calibracion)." +"\x00" # "Y-correct:" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 1a292d2804..90fd096e10 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)." +"\x00" # "Y-correct:" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 60a8a2ca83..4333041d33 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):" +"\x00" # "Y-correct:" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 0afdd7bfec..29d48ed8ac 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1232,7 +1232,7 @@ # "The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)." -"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." +"\x00" # "Y-correct:" From 726b4156d10a4fd19ea9f1ff78ff0521d480928e Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 24 Oct 2019 15:56:25 +0200 Subject: [PATCH 189/190] Shorten "Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." to fit on single screen. --- 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 90181ebf39..90ea6d159a 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Automatisches Laden Filament nur bei einge schaltetem Filament- sensor verfuegbar..." +"Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." From 023ce01f9d8d4b1437db2d0558082401cd21f326 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 24 Oct 2019 16:12:46 +0200 Subject: [PATCH 190/190] Version 3.8.1 final. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 87b5023f91..589d428a78 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.1-RC1" -#define FW_COMMIT_NR 2851 +#define FW_VERSION "3.8.1" +#define FW_COMMIT_NR 2869 // 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