From 6fa798aa8300499cbf48ae049e50dbd3066c0dff Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 10 Sep 2018 20:08:13 +0200 Subject: [PATCH 01/25] init --- Firmware/mmu.cpp | 14 +++++++++++++- Firmware/ultralcd.cpp | 14 +++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 7c38e9ea..ebed61ec 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -113,8 +113,10 @@ void mmu_loop(void) case -1: if (mmu_rx_start() > 0) { +#ifdef MMU_DEBUG puts_P(PSTR("MMU => 'start'")); puts_P(PSTR("MMU <= 'S1'")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("S1\n")); //send 'read version' request mmu_state = -2; } @@ -128,9 +130,11 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%u"), &mmu_version); //scan version from buffer +#ifdef MMU_DEBUG printf_P(PSTR("MMU => '%dok'\n"), mmu_version); puts_P(PSTR("MMU <= 'S2'")); - mmu_puts_P(PSTR("S2\n")); //send 'read buildnr' request +#endif //MMU_DEBUG + mmu_puts_P(PSTR("S2\n")); //send 'read buildnr' request mmu_state = -3; } return; @@ -138,11 +142,15 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%u"), &mmu_buildnr); //scan buildnr from buffer +#ifdef MMU_DEBUG printf_P(PSTR("MMU => '%dok'\n"), mmu_buildnr); +#endif //MMU_DEBUG bool version_valid = mmu_check_version(); if (!version_valid) mmu_show_warning(); else puts_P(PSTR("MMU version valid")); +#ifdef MMU_DEBUG puts_P(PSTR("MMU <= 'P0'")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("P0\n")); //send 'read finda' request mmu_state = -4; } @@ -151,7 +159,9 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer +#ifdef MMU_DEBUG printf_P(PSTR("MMU => '%dok'\n"), mmu_finda); +#endif //MMU_DEBUG puts_P(PSTR("MMU - ENABLED")); mmu_enabled = true; mmu_state = 1; @@ -203,7 +213,9 @@ void mmu_loop(void) } else if ((mmu_last_response + 300) < millis()) //request every 300ms { +#ifdef MMU_DEBUG puts_P(PSTR("MMU <= 'P0'")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("P0\n")); //send 'read finda' request mmu_state = 2; } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 04cf8073..e49efdc7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -530,7 +530,7 @@ void lcdui_print_extruder(void) { int chars = 0; if (mmu_extruder == tmp_extruder) - chars = lcd_printf_P(_N(" T%u"), mmu_extruder+1); + chars = lcd_printf_P(_N(" F%u"), mmu_extruder+1); else chars = lcd_printf_P(_N(" %u>%u"), mmu_extruder+1, tmp_extruder+1); lcd_space(5 - chars); @@ -4361,8 +4361,10 @@ void lcd_wizard(int state) { int wizard_event; const char *msg = NULL; while (!end) { + printf_P(PSTR("Wizard state: %d"), state); switch (state) { case 0: // run wizard? + 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 = 1; @@ -4408,7 +4410,6 @@ void lcd_wizard(int state) { break; case 5: //is filament loaded? //start to preheat nozzle and bed to save some time later - lcd_commands_type = LCD_COMMAND_V2_CAL; setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0); setTargetBed(PLA_PREHEAT_HPB_TEMP); wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 @@ -4446,7 +4447,7 @@ void lcd_wizard(int state) { #ifdef SNMM change_extr(0); #endif - loading_flag = true; + loading_flag = true; gcode_M701(); state = 9; break; @@ -4480,7 +4481,7 @@ void lcd_wizard(int state) { } } - printf_P(_N("State: %d\n"), state); + printf_P(_N("Wizard end state: %d\n"), state); switch (state) { //final message case 0: //user dont want to use wizard msg = _T(MSG_WIZARD_QUIT); @@ -4514,7 +4515,10 @@ void lcd_wizard(int state) { break; } - if (state != 9) lcd_show_fullscreen_message_and_wait_P(msg); + if (state != 9) { + lcd_show_fullscreen_message_and_wait_P(msg); + wizard_active = false; + } lcd_update_enable(true); lcd_return_to_status(); lcd_update(2); From 1bb9e9ed924af59731dc3ffc4c14fdb3970126a0 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 10 Sep 2018 20:39:28 +0200 Subject: [PATCH 02/25] MMU_DEBUG --- Firmware/mmu.cpp | 16 ++++++++++++++++ .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index ebed61ec..3e71737a 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -173,39 +173,51 @@ void mmu_loop(void) if ((mmu_cmd >= MMU_CMD_T0) && (mmu_cmd <= MMU_CMD_T4)) { filament = mmu_cmd - MMU_CMD_T0; +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'T%d'\n"), filament); +#endif //MMU_DEBUG mmu_printf_P(PSTR("T%d\n"), filament); mmu_state = 3; // wait for response } else if ((mmu_cmd >= MMU_CMD_L0) && (mmu_cmd <= MMU_CMD_L4)) { filament = mmu_cmd - MMU_CMD_L0; +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'L%d'\n"), filament); +#endif //MMU_DEBUG mmu_printf_P(PSTR("L%d\n"), filament); mmu_state = 3; // wait for response } else if (mmu_cmd == MMU_CMD_C0) { +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'C0'\n")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("C0\n")); //send 'continue loading' mmu_state = 3; } else if (mmu_cmd == MMU_CMD_U0) { +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'U0'\n")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("U0\n")); //send 'unload current filament' mmu_state = 3; } else if ((mmu_cmd >= MMU_CMD_E0) && (mmu_cmd <= MMU_CMD_E4)) { int filament = mmu_cmd - MMU_CMD_E0; +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'E%d'\n"), filament); +#endif //MMU_DEBUG mmu_printf_P(PSTR("E%d\n"), filament); //send eject filament mmu_state = 3; // wait for response } else if (mmu_cmd == MMU_CMD_R0) { +#ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'R0'\n")); +#endif //MMU_DEBUG mmu_puts_P(PSTR("R0\n")); //send recover after eject mmu_state = 3; // wait for response } @@ -224,7 +236,9 @@ void mmu_loop(void) if (mmu_rx_ok() > 0) { fscanf_P(uart2io, PSTR("%hhu"), &mmu_finda); //scan finda from buffer +#ifdef MMU_DEBUG printf_P(PSTR("MMU => '%dok'\n"), mmu_finda); +#endif //MMU_DEBUG //printf_P(PSTR("Eact: %d\n"), int(e_active())); if (!mmu_finda && CHECK_FINDA && fsensor_enabled) { fsensor_stop_and_save_print(); @@ -244,7 +258,9 @@ void mmu_loop(void) case 3: //response to mmu commands if (mmu_rx_ok() > 0) { +#ifdef MMU_DEBUG printf_P(PSTR("MMU => 'ok'\n")); +#endif //MMU_DEBUG mmu_ready = true; mmu_state = 1; } diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 304cde4b..626c64e8 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -481,4 +481,6 @@ //#define SUPPORT_VERBOSITY +//#define MMU_DEBUG //print communication between MMU2 and printer on serial + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 9fccbfc2..cb13e8ad 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -482,4 +482,6 @@ //#define SUPPORT_VERBOSITY +//#define MMU_DEBUG //print communication between MMU2 and printer on serial + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 7cde630b..ea1951f4 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -613,4 +613,6 @@ //#define SUPPORT_VERBOSITY +//#define MMU_DEBUG //print communication between MMU2 and printer on serial + #endif //__CONFIGURATION_PRUSA_H From 8a9f066c1b5ea05a61d90b57c283f7f1ef3708c3 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 10 Sep 2018 22:09:37 +0200 Subject: [PATCH 03/25] choose_extruder_menu: extruder -> filament --- Firmware/ultralcd.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e49efdc7..7a434a43 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4364,7 +4364,6 @@ void lcd_wizard(int state) { printf_P(PSTR("Wizard state: %d"), state); switch (state) { case 0: // run wizard? - 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 = 1; @@ -4517,7 +4516,6 @@ void lcd_wizard(int state) { } if (state != 9) { lcd_show_fullscreen_message_and_wait_P(msg); - wizard_active = false; } lcd_update_enable(true); lcd_return_to_status(); @@ -5014,18 +5012,18 @@ char choose_extruder_menu() enc_dif = lcd_encoder_diff; lcd_clear(); - - lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); + if (mmu_enabled) lcd_puts_P(_T(MSG_CHOOSE_FILAMENT)); + else lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); lcd_set_cursor(0, 1); lcd_print(">"); for (int i = 0; i < 3; i++) { - lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); + lcd_puts_at_P(1, i + 1, mmu_enabled ? _T(MSG_FILAMENT) : _T(MSG_EXTRUDER)); } KEEPALIVE_STATE(PAUSED_FOR_USER); while (1) { for (int i = 0; i < 3; i++) { - lcd_set_cursor(2 + strlen_P(_T(MSG_EXTRUDER)), i+1); + lcd_set_cursor(2 + strlen_P( mmu_enabled ? _T(MSG_FILAMENT) : _T(MSG_EXTRUDER)), i+1); lcd_print(first + i + 1); } @@ -5048,9 +5046,10 @@ char choose_extruder_menu() if (first < items_no - 3) { first++; lcd_clear(); - lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); + if (mmu_enabled) lcd_puts_P(_T(MSG_CHOOSE_FILAMENT)); + else lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); for (int i = 0; i < 3; i++) { - lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); + lcd_puts_at_P(1, i + 1, mmu_enabled ? _T(MSG_FILAMENT) : _T(MSG_EXTRUDER)); } } } @@ -5060,9 +5059,10 @@ char choose_extruder_menu() if (first > 0) { first--; lcd_clear(); - lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); + if (mmu_enabled) lcd_puts_P(_T(MSG_CHOOSE_FILAMENT)); + else lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); for (int i = 0; i < 3; i++) { - lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); + lcd_puts_at_P(1, i + 1, mmu_enabled ? _T(MSG_FILAMENT) : _T(MSG_EXTRUDER)); } } } From 4ca300bc3933ba600566f7a9a5ae5531e4236344 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 11 Sep 2018 03:43:05 +0200 Subject: [PATCH 04/25] Lang update, french translation +resized reserved space --- Firmware/config.h | 3 +- Firmware/language.c | 1 + Firmware/language.h | 1 + lang/fw-clean.sh | 1 + lang/iso639-1.txt | 2 +- lang/lang_en.txt | 66 ++- lang/lang_en_cz.txt | 175 +++++-- lang/lang_en_de.txt | 133 ++++- lang/lang_en_es.txt | 249 +++++---- lang/lang_en_fr.txt | 1184 +++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_it.txt | 415 +++++++++------ lang/lang_en_pl.txt | 226 ++++++--- lang/make_lang.sh | 4 +- lang/postbuild.sh | 5 + 14 files changed, 2057 insertions(+), 408 deletions(-) create mode 100644 lang/lang_en_fr.txt diff --git a/Firmware/config.h b/Firmware/config.h index 5ba843c5..4c01eb3e 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -45,8 +45,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2400 // reserved space for secondary language (~12kb) -//#define LANG_SIZE_RESERVED 0x1ef8 // reserved space for secondary language (~10kb) +#define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (~10kb) #endif //_CONFIG_H diff --git a/Firmware/language.c b/Firmware/language.c index 79b6cb0a..8c1bfc46 100644 --- a/Firmware/language.c +++ b/Firmware/language.c @@ -207,6 +207,7 @@ const char* lang_get_name_by_code(uint16_t code) case LANG_CODE_CZ: return _n("Cestina"); case LANG_CODE_DE: return _n("Deutsch"); case LANG_CODE_ES: return _n("Espanol"); + case LANG_CODE_FR: return _n("Francais"); case LANG_CODE_IT: return _n("Italiano"); case LANG_CODE_PL: return _n("Polski"); } diff --git a/Firmware/language.h b/Firmware/language.h index f0cff9a1..28364817 100644 --- a/Firmware/language.h +++ b/Firmware/language.h @@ -94,6 +94,7 @@ typedef struct #define LANG_CODE_CZ 0x6373 //!<'cs' #define LANG_CODE_DE 0x6465 //!<'de' #define LANG_CODE_ES 0x6573 //!<'es' +#define LANG_CODE_FR 0x6671 //!<'fr' #define LANG_CODE_IT 0x6974 //!<'it' #define LANG_CODE_PL 0x706c //!<'pl' ///@} diff --git a/lang/fw-clean.sh b/lang/fw-clean.sh index a7d34072..cac91fbf 100644 --- a/lang/fw-clean.sh +++ b/lang/fw-clean.sh @@ -34,6 +34,7 @@ rm_if_exists firmware.hex rm_if_exists firmware_cz.hex rm_if_exists firmware_de.hex rm_if_exists firmware_es.hex +rm_if_exists firmware_fr.hex rm_if_exists firmware_it.hex rm_if_exists firmware_pl.hex rm_if_exists progmem.out diff --git a/lang/iso639-1.txt b/lang/iso639-1.txt index aa6f64e5..d8b2a8fd 100644 --- a/lang/iso639-1.txt +++ b/lang/iso639-1.txt @@ -5,6 +5,6 @@ # de German Deutsch # cs Czech Cestina # es Spanish Espanol -# fr +# fr French Francais # it Italian Italiano # pl Polish Polski diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 5d63a693..94c97273 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -49,6 +49,12 @@ #MSG_ADJUSTZ c=0 r=0 "Auto adjust Z?" +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" + #MSG_AUTO_HOME c=0 r=0 "Auto home" @@ -169,6 +175,15 @@ #MSG_EXTRUDER_CORRECTION c=9 r=0 "E-correct" +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" + #MSG_END_FILE_LIST c=0 r=0 "End file list" @@ -232,6 +247,9 @@ #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" + #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" @@ -250,6 +268,9 @@ #MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 "Filament sensor:" +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -439,6 +460,18 @@ #MSG_MESH_BED_LEVELING c=0 r=0 "Mesh Bed Leveling" +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." + +#MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +"MMU OK. Resuming position..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." + #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" @@ -562,9 +595,18 @@ #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." + #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." + #MSG_PLEASE_WAIT c=20 r=0 "Please wait" @@ -616,6 +658,9 @@ #MSG_RECOVERING_PRINT c=20 r=1 "Recovering print " +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." + #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" @@ -698,17 +743,29 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [None]" +"Sort: [none]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" +"Sort: [time]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" +"Sort: [alphabet]" #MSG_SORTING c=20 r=1 "Sorting files" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" + #MSG_SPEED c=0 r=0 "Speed" @@ -760,6 +817,9 @@ #MSG_MENU_TEMPERATURES c=15 r=1 "Temperatures" +#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." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ec701e9b..2aa39a78 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,10 +1,10 @@ #MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 " [off" -"\x00" +"[vyp" #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " -" PlannerBufferBytes: " +"\x00" #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" @@ -16,7 +16,7 @@ #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " -"\x00" +"Naposledy aktualizovano:" #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" @@ -28,19 +28,19 @@ #MSG_MEASURED_OFFSET c=0 r=0 "[0;0] point offset" -"\x00" +"[0;0] odsazeni bodu" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -"\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu" +"\x00" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -"\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu" +"\x00" #MSG_REFRESH c=0 r=0 "\xf8Refresh" -"\xf8Obnovit" +"\x00" #MSG_BABYSTEPPING_Z c=20 r=0 "Adjusting Z" @@ -66,6 +66,14 @@ "Auto adjust Z?" "Auto doladit Z ?" +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"\x00" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"\x00" + #MSG_AUTO_HOME c=0 r=0 "Auto home" "\x00" @@ -76,7 +84,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Automaticke zavadeni filamentu dostupne pouze pri zapnutem filament senzoru..." +"Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." @@ -188,15 +196,15 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Crash det. [zap]" +"Crash det. [zap]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Crash det. [N/A]" +"\x00" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Crash det. [vyp]" +"Crash det. [vyp]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -204,7 +212,7 @@ #MSG_CURRENT c=19 r=1 "Current" -"Pouze aktualni" +"\x00" #MSG_DATE c=17 r=1 "Date:" @@ -220,12 +228,24 @@ #MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -"Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a heatbed?" +"Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a heatbedem?" #MSG_EXTRUDER_CORRECTION c=9 r=0 "E-correct" "\x00" +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Vysunout filament" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Vysunout filament 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Vysouvam filament" + #MSG_END_FILE_LIST c=0 r=0 "End file list" "\x00" @@ -308,11 +328,15 @@ #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Fil. senzor [zap]" +"\x00" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"Senzor nerozpoznal filament, vypnout?" #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" -"Fil. senzor [N/A]" +"\x00" #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" @@ -320,7 +344,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Filament vytlacen a spravne barvy?" +"\x00" #MSG_NOT_LOADED c=19 r=0 "Filament not loaded" @@ -334,6 +358,10 @@ "Filament sensor:" "Senzor filamentu:" +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Spotrebovano filamentu" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Soubor nekompletni. Pokracovat?" @@ -372,7 +400,7 @@ #MSG_BED_CORRECTION_FRONT c=14 r=1 "Front side[um]" -"Vpredu [um]" +"Vpredu [um]" #MSG_SELFTEST_FANS c=0 r=0 "Front/left fans" @@ -420,11 +448,11 @@ #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"Kontrola bed " +"\x00" #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" -"Kontrola endstops" +"\x00" #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " @@ -436,15 +464,15 @@ #MSG_SELFTEST_CHECK_X c=20 r=0 "Checking X axis " -"Kontrola X axis " +"\x00" #MSG_SELFTEST_CHECK_Y c=20 r=0 "Checking Y axis " -"Kontrola Y axis " +"\x00" #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -"Kontrola Z axis " +"\x00" #MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 "checksum mismatch, Last Line: " @@ -464,7 +492,7 @@ #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" +"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 r=0 "Improving bed calibration point" @@ -508,7 +536,7 @@ #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -"Je tiskovy plat na heatbed?" +"\x00" #MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 "Iteration " @@ -586,17 +614,33 @@ "Mesh Bed Leveling" "\x00" +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"MMU potrebuje zasah uzivatele. Opravte chybu a pote stisknete tlacitko na jednotce MMU." + +#MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +"MMU OK. Resuming position..." +"MMU OK. Pokracuji v tisku..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Pokracuji v nahrivani..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Pokracuji..." + #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Mod [Normal]" +"Mod [Normal]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Mod [tichy]" +"Mod [tichy]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Mod [Stealth]" +"Mod [Stealth]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" @@ -604,7 +648,7 @@ #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" -"Mod [vys. vykon]" +"Mod [vys. vykon]" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -648,7 +692,7 @@ #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" -"Netoci se" +"\x00" #MSG_WIZARD_V2_CAL c=20 r=8 "Now I will calibrate distance between tip of the nozzle and heatbed surface." @@ -704,7 +748,7 @@ #MSG_PAPER c=20 r=8 "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." -"Umistete list papiru na podlozku a udrzujte jej pod tryskou behem mereni prvnich 4 bodu. Pokud tryska zachyti papir, vypnete tiskarnu." +"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 "Please clean heatbed and then press the knob." @@ -720,7 +764,7 @@ #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." -"Prosim nahlednete do manualu a opravte problem. Po te obnovte Wizarda rebootovanim tiskarny." +"Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Wizarda restartovanim tiskarny." #MSG_WIZARD_LOAD_FILAMENT c=20 r=8 "Please insert PLA filament to the extruder, then press knob to load it." @@ -732,7 +776,7 @@ #MSG_PLEASE_LOAD_PLA c=20 r=4 "Please load PLA filament first." -"Nejdrive zavedte PLA filament prosim." +"Nejdrive prosim zavedte PLA filament." #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." @@ -750,9 +794,21 @@ "Please pull out filament immediately" "Prosim vyjmete urychlene filament" +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Prosim vyjmete filament a pote stisknete tlacitko." + #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." -"Odstrante tiskovy plat z heatbed prosim." +"Odstrante prosim tiskovy plat z podlozky." + +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Nejprve spustte kalibraci XYZ." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." #MSG_PLEASE_WAIT c=20 r=0 "Please wait" @@ -822,6 +878,10 @@ "Recovering print " "Obnovovani tisku " +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." + #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" "\x00" @@ -848,11 +908,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"RPi port [zap]" +"RPi port [zap]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"RPi port [vyp]" +"RPi port [vyp]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -860,7 +920,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" -"SD card [normal]" +"SD card [normal]" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" @@ -928,24 +988,40 @@ #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." -"Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100." +"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [None]" -"Trideni [Zadne]" +"Sort: [none]" +"Trideni [Zadne]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" -"Trideni [Cas]" +"Sort: [time]" +"Trideni [Cas]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" +"Sort: [alphabet]" "Trideni [Abeceda]" #MSG_SORTING c=20 r=1 "Sorting files" "Trideni souboru" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Zvuk [hlasity]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Zvuk [vypnuto]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Zvuk [jednou]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Zvuk [tichy]" + #MSG_SPEED c=0 r=0 "Speed" "Rychlost" @@ -956,7 +1032,7 @@ #MSG_TEMP_CAL_WARNING c=20 r=4 "Stable ambient temperature 21-26C is needed a rigid stand is required." -"\x00" +"Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." #MSG_STATISTICS c=0 r=0 "Statistics " @@ -988,11 +1064,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Tepl. kal. [zap]" +"Tepl. kal. [zap]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Tepl. kal. [vyp]" +"Tepl. kal. [vyp]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1014,6 +1090,10 @@ "Temperatures" "Teploty" +#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." +"Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "\x00" @@ -1052,7 +1132,7 @@ #MSG_WAITING_TEMP_PINDA c=20 r=3 "Waiting for PINDA probe cooling" -"Cekani na zchladnuti PINDA" +"\x00" #MSG_CHANGED_BOTH c=20 r=4 "Warning: both printer type and motherboard type changed." @@ -1100,5 +1180,4 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." -"Wizarda muzete kdykoliv znovu spustit z menu Calibration -> Wizard" - +"\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 45312a9c..d8958717 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -8,7 +8,7 @@ #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" -" stopp, Extruder kalt!" +" stopp, Extruder kalt" #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " @@ -66,6 +66,14 @@ "Auto adjust Z?" "Auto Z einstellen?" +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"Restemodus [an]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"Restemodus [aus]" + #MSG_AUTO_HOME c=0 r=0 "Auto home" "Startposition" @@ -188,15 +196,15 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Crash-Erkennung [an]" +"Crash Erk. [an]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Crash-Erkennung [nv]" +"Crash Erk. [nv]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Crash-Erkennung[aus]" +"Crash Erk. [aus]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -226,6 +234,18 @@ "E-correct" "E-Korrektur" +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Filamentauswurf" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Filamentauswurf 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Werfe Filament aus" + #MSG_END_FILE_LIST c=0 r=0 "End file list" "Ende Dateiliste" @@ -280,15 +300,15 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"F.Autoladen [an]" +"F.Autoladen [an]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"F. Auto Laden [nv]" +"F. Autoload [nv]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"F. Auto Laden [aus]" +"F. Autoload [aus]" #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -300,23 +320,27 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Luefter Check [an]" +"Luefter Chk. [an]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Luefter Check [aus]" +"Luefter Chk.[aus]" #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Filamentsensor [an]" +"Fil. Sensor [an]" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"Fil. Sensorsignal ist schlecht, ausschalten?" #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" -"Filamentsensor [nv]" +"Fil. Sensor [nv]" #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" -"Filamentsensor [aus]" +"Fil. Sensor [aus]" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -334,6 +358,10 @@ "Filament sensor:" "Filamentsensor:" +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Filament benutzt" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Datei unvollstaendig Trotzdem fortfahren?" @@ -584,15 +612,31 @@ #MSG_MESH_BED_LEVELING c=0 r=0 "Mesh Bed Leveling" -"Mesh Bett Ausgleich" +"Mesh Bett Ausglei." + +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"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 OK. Resuming position..." +"MMU OK. Position wiederherstellen..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Temperatur wiederherstellen..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Weiterdrucken..." #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Modus [Normal]" +"Modus [Normal]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Modus [leise]" +"Modus [leise]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" @@ -600,11 +644,11 @@ #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" -"Modus [Auto Power]" +"Modus[Auto Power]" #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" -"Modus[Hohe Leistung]" +"Modus[Hohe Leist]" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -750,10 +794,22 @@ "Please pull out filament immediately" "Bitte ziehen Sie das Filament sofort heraus" +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Bitte Filament entfernen und dann den Knopf druecken." + #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." "Bitte entfernen Sie das Stahlblech vom Heizbett." +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Bitte zuerst XYZ Kalibrierung ausfuehren." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." + #MSG_PLEASE_WAIT c=20 r=0 "Please wait" "Bitte warten" @@ -822,13 +878,17 @@ "Recovering print " "Druck wiederherst " +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." + #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" "Statusbericht Endanschlag" #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." -"XYZ Kalibr. zuruecksetzen." +"XYZ Kalib.zurueck" #MSG_BED_CORRECTION_RESET c=0 r=0 "Reset" @@ -864,7 +924,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" -"SD Karte [FlashAir]" +"SD Kart.[FlshAir]" #MSG_SD_CARD_OK c=0 r=0 "SD card ok" @@ -931,21 +991,37 @@ "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [None]" +"Sort: [none]" "Sort.: [Keine]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" -"Sort.: [Zeit]" +"Sort: [time]" +"Sort.: [Zeit]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" -"Sort.: [Alphab.]" +"Sort: [alphabet]" +"Sort.: [Alphabet]" #MSG_SORTING c=20 r=1 "Sorting files" "Sortiere Dateien" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Sound [laut]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Sound [stumm]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Sound [einmal]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Sound [leise]" + #MSG_SPEED c=0 r=0 "Speed" "Geschwindigkeit" @@ -988,11 +1064,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" @@ -1014,6 +1090,10 @@ "Temperatures" "Temperaturen" +#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." +"Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "AUSGELOEST" @@ -1101,4 +1181,3 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" - diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f6bc1608..f1a82141 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,6 +1,6 @@ #MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 " [off" -" [ina" +" [inactivo" #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " @@ -8,15 +8,15 @@ #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" -"extrusion en frio prevenida" +" extrusion en frio prevenida" #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " -"Memoria Libre: " +" Memoria Libre: " #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " -"Ultima actualizacion: " +" Ultima actualizacion: " #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" @@ -32,11 +32,11 @@ #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -"\x00" +"\x1b[2JDec. choque\x1b[1;0Hpuede ser activada solo en\x1b[2;0HModo normal" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -"\x00" +"\x1b[2JATENCION:\x1b[1;0HDec. choque\x1b[2;0Hdesactivada en\x1b[3;0HModo silencio" #MSG_REFRESH c=0 r=0 "\xf8Refresh" @@ -48,7 +48,7 @@ #MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 "All correct " -"Todo bien" +"Todo bien " #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" @@ -64,7 +64,15 @@ #MSG_ADJUSTZ c=0 r=0 "Auto adjust Z?" -"Ajustar Eje Z" +"Ajustar Eje Z?" + +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"Auto despleg.[on]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"Auto despleg[off]" #MSG_AUTO_HOME c=0 r=0 "Auto home" @@ -80,7 +88,7 @@ #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 mando e inserte el filamento..." +"La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." #MSG_SELFTEST_AXIS_LENGTH c=0 r=0 "Axis length" @@ -104,7 +112,7 @@ #MSG_BED_CORRECTION_MENU c=0 r=0 "Bed level correct" -"Correcion cama" +"Corr. de la cama" #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." @@ -116,15 +124,15 @@ #MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 "Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Nivelacion fallada. Sensor activado muy arriba. Esperando reset." +"Nivelacion fallada. Sensor funciona demasiado pronto. Esperando reset." #MSG_BED c=0 r=0 "Bed" -"Base caliente" +"Base calefactable" #MSG_BEGIN_FILE_LIST c=0 r=0 "Begin file list" -"Comienzo lista arch. " +"Comienzo lista arch." #MSG_MENU_BELT_STATUS c=15 r=1 "Belt status" @@ -132,7 +140,7 @@ #MSG_RECOVER_PRINT c=20 r=2 "Blackout occurred. Recover print?" -"Corte electrico. Reanudar la impresion?" +"Se fue la luz. Reanudar la impresion?" #MSG_CALIBRATE_BED c=0 r=0 "Calibrate XYZ" @@ -148,7 +156,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." -"Calibrando XYZ. Gira el mando para subir el extrusor hasta tocar los topes superiores. Despues haz clic." +"Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." #MSG_CALIBRATE_Z_AUTO c=20 r=2 "Calibrating Z" @@ -156,7 +164,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." -"Calibrando Z. Gira el mando para subir el extrusor hasta tocar los topes superiores. Despues haz clic." +"Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." #MSG_HOMEYZ_DONE c=0 r=0 "Calibration done" @@ -192,7 +200,7 @@ #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Det. choque [N/D]" +"Dec. choque [N/D]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" @@ -220,19 +228,31 @@ #MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -"Quieres repetir el ultimo paso para reajustar la distancia entre boquilla y base?" +"Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" #MSG_EXTRUDER_CORRECTION c=9 r=0 "E-correct" -"E-correct" +"E-correcion" + +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Expulsar filamento" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Expulsar filamento 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Expulsando filamento" #MSG_END_FILE_LIST c=0 r=0 "End file list" -"Fin lista arch. " +"Fin lista arch." #MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 "Endstop not hit" -"Endstop no detectado" +"Endstop no alcanzado" #MSG_SELFTEST_ENDSTOP c=0 r=0 "Endstop" @@ -240,7 +260,7 @@ #MSG_ENDSTOPS_HIT c=0 r=0 "endstops hit: " -"endstops detectado: " +"endstops golpean: " #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" @@ -252,7 +272,7 @@ #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" -"Error - se ha sobreescrito la memoria estatica" +"Error - se ha sobre-escrito la memoria estatica" #MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 "error writing to file" @@ -280,15 +300,15 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"Autocarg f. [act]" +"Autocarga F.[act]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"Autocarg f. [N/D]" +"Autocarga F.[N/D]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"Autocarg f. [ina]" +"Autocarga f.[ina]" #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -300,15 +320,19 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Com. ventil [act]" +"Compro. vent[act]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Com. ventil [ina]" +"Compro. vent[ina]" #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Sensor Fil. [activo]" +"Sensor Fil. [act]" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"La respuesta del sensor de fil es deficiente, desactivarlo?" #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" @@ -316,11 +340,11 @@ #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" -"Sensor Fil. [act]" +"Sensor Fil. [ina]" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Es homogeneo el color nuevo?" +"Es nitido el color nuevo?" #MSG_NOT_LOADED c=19 r=0 "Filament not loaded" @@ -334,6 +358,10 @@ "Filament sensor:" "Sensor de filamento:" +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Filamento usado" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Archivo incompleto. Continuar de todos modos?" @@ -384,7 +412,7 @@ #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." -"Calentadores desactivados por seguridad." +"Calentadores desactivados por el temporizador de seguridad." #MSG_HEATING_COMPLETE c=20 r=0 "Heating done." @@ -392,7 +420,7 @@ #MSG_HEATING c=0 r=0 "Heating" -"Calentando..." +"Calentando" #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?" @@ -408,7 +436,7 @@ #MSG_CHANGE_SUCCESS c=0 r=0 "Change success!" -"Cambio correcto" +"Cambio correcto!" #MSG_CORRECTLY c=20 r=0 "Changed correctly?" @@ -416,11 +444,11 @@ #MSG_CHANGING_FILAMENT c=20 r=0 "Changing filament!" -"Cambiando filamento" +"Cambiando filamento!" #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"Control base cal." +"Control base cal. " #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" @@ -428,27 +456,27 @@ #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " -"Control fusor" +"Control fusor " #MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 "Checking sensors " -"Comprobando los sensores" +"Comprobando los sensores " #MSG_SELFTEST_CHECK_X c=20 r=0 "Checking X axis " -"Control sensor X" +"Control sensor X " #MSG_SELFTEST_CHECK_Y c=20 r=0 "Checking Y axis " -"Control sensor Y" +"Control sensor Y " #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -"Control sensor Z" +"Control sensor Z " #MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 "checksum mismatch, Last Line: " -"disparidad checksum, Ult. Linea: " +"inconcluencia checksum, Ult. Linea: " #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" @@ -464,11 +492,11 @@ #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 mando, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." +"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 r=0 "Improving bed calibration point" -"Mejorando punto de cal. en la base" +"Mejorando punto de calibracion base" #MSG_WATCH c=0 r=0 "Info screen" @@ -516,7 +544,7 @@ #MSG_KILLED c=0 r=0 "KILLED. " -"PARADA DE EMERGENCIA" +"PARADA DE EMERGENCIA. " #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" @@ -548,15 +576,15 @@ #MSG_M104_INVALID_EXTRUDER c=0 r=0 "M104 Invalid extruder " -"M104 Extrusor invalido" +"M104 Extrusor invalido " #MSG_M105_INVALID_EXTRUDER c=0 r=0 "M105 Invalid extruder " -"M105 Extrusor invalido" +"M105 Extrusor invalido " #MSG_M109_INVALID_EXTRUDER c=0 r=0 "M109 Invalid extruder " -"M109 Extrusor invalido" +"M109 Extrusor invalido " #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." @@ -564,15 +592,15 @@ #MSG_M200_INVALID_EXTRUDER c=0 r=0 "M200 Invalid extruder " -"M200 Extrusor invalido" +"M200 Extrusor invalido " #MSG_M218_INVALID_EXTRUDER c=0 r=0 "M218 Invalid extruder " -"M218 Extrusor invalido" +"M218 Extrusor invalido " #MSG_M221_INVALID_EXTRUDER c=0 r=0 "M221 Invalid extruder " -"M221 Extrusor invalido" +"M221 Extrusor invalido " #MSG_MAIN c=0 r=0 "Main" @@ -586,6 +614,22 @@ "Mesh Bed Leveling" "Nivelacion Mesh Level" +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"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 OK. Resuming position..." +"MMU OK. Restaurando posicion..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Restaurando temperatura..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Resumiendo..." + #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" "Modo [Normal]" @@ -632,7 +676,7 @@ #MSG_NO_MOVE c=0 r=0 "No move." -"Sin movimiento" +"Sin movimiento." #MSG_NO_CARD c=0 r=0 "No SD card" @@ -644,7 +688,7 @@ #MSG_SELFTEST_NOTCONNECTED c=0 r=0 "Not connected" -"No hay conexion " +"No hay conexion" #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" @@ -668,7 +712,7 @@ #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" +"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc." #MSG_SD_OPEN_FILE_FAIL c=0 r=0 "open failed, File: " @@ -680,7 +724,7 @@ #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" -"fallo openRoot " +"fallo openRoot" #MSG_PAUSE_PRINT c=0 r=0 "Pause print" @@ -708,7 +752,7 @@ #MSG_WIZARD_CLEAN_HEATBED c=20 r=8 "Please clean heatbed and then press the knob." -"Limpia la superficie de la base, por favor, y haz clic" +"Limpia la superficie de la base, por favor, y haz clic." #MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 "Please clean the nozzle for calibration. Click when done." @@ -720,7 +764,7 @@ #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 "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" +"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." @@ -728,7 +772,7 @@ #MSG_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8 "Please load PLA filament and then resume Wizard by rebooting the printer." -"Carga filamento PLA, por favor, y reinicia la impresora para continuar con el Wizard" +"Carga filamento PLA, por favor, y reinicia la impresora para continuar con el Wizard." #MSG_PLEASE_LOAD_PLA c=20 r=4 "Please load PLA filament first." @@ -744,19 +788,31 @@ #MSG_PRESS_TO_UNLOAD c=20 r=4 "Please press the knob to unload filament" -"Por favor, pulsa el mando para descargar el filamento" +"Por favor, pulsa el dial para descargar el filamento" #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" "Por favor retire el filamento de inmediato" +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Por favor quite el filamento y luego presione el dial." + #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." -"Por favor retire la chapa de acero de la base caliente." +"Por favor retire la chapa de acero de la base calefactable." + +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Por favor realiza la calibracion XYZ primero." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Por favor actualice el firmware en tu MMU2. Esperando el reseteo." #MSG_PLEASE_WAIT c=20 r=0 "Please wait" -"Espera por favor" +"Por Favor Espere" #MSG_POWERUP c=0 r=0 "PowerUp" @@ -776,7 +832,7 @@ #MSG_PRESS_TO_PREHEAT c=20 r=4 "Press knob to preheat nozzle and continue." -"Pulsa el mando para precalentar la boquilla y continua." +"Pulsa el dial para precalentar la boquilla y continue." #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" @@ -784,7 +840,7 @@ #MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 "Print fan:" -"Ventilador frontal:" +"Ventilador del fusor:" #MSG_CARD_MENU c=0 r=0 "Print from SD" @@ -800,7 +856,7 @@ #MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." -"Impresora no esta calibrada todavia. Por favor usa el manual, capitulo Primeros pasos, flujo de Calibracion." +"Impresora no esta calibrada todavia. Por favor usa el manual capitulo Primeros pasos Calibracion flujo." #MSG_ERR_STOPPED c=0 r=0 "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" @@ -808,7 +864,7 @@ #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." -"Prusa i3 MK3 lista" +"Prusa i3 MK3 prep." #MSG_PRUSA3D c=0 r=0 "prusa3d.com" @@ -820,7 +876,11 @@ #MSG_RECOVERING_PRINT c=20 r=1 "Recovering print " -"Recuperando impresion" +"Recuperando impresion " + +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" @@ -876,7 +936,7 @@ #MSG_SD_PRINTING_BYTE c=0 r=0 "SD printing byte " -"SD byte impresion" +"SD byte impresion " #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" @@ -892,11 +952,11 @@ #MSG_SELFTEST_START c=20 r=0 "Self test start " -"Iniciar Selftest " +"Iniciar Selftest " #MSG_SELFTEST c=0 r=0 "Selftest " -"Selftest " +"\x00" #MSG_SELFTEST_ERROR c=0 r=0 "Selftest error !" @@ -904,7 +964,7 @@ #MSG_SELFTEST_FAILED c=20 r=0 "Selftest failed " -"Fallo Selftest " +"Fallo Selftest " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." @@ -928,24 +988,40 @@ #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." -"Algunos archivos no se ordenaran. El maximo es 100 archivos por carpeta. " +"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar." #MSG_SORT_NONE c=17 r=1 -"Sort: [None]" -"Orden: [Ninguno]" +"Sort: [none]" +"Ordena: [Ninguno]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" +"Sort: [time]" "Orden: [Fecha]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" -"Orden:[Alfabetic]" +"Sort: [alphabet]" +"Orden: [Alfabet.]" #MSG_SORTING c=20 r=1 "Sorting files" "Ordenando archivos" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Sonido [alto]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Sonido [silenc.]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Sonido [una vez]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Sonido[silencios]" + #MSG_SPEED c=0 r=0 "Speed" "Velocidad" @@ -972,7 +1048,7 @@ #MSG_STOPPED c=0 r=0 "STOPPED. " -"PARADA" +"PARADA. " #MSG_SUPPORT c=0 r=0 "Support" @@ -1000,7 +1076,7 @@ #MSG_TEMP_CAL_FAILED c=20 r=8 "Temperature calibration failed" -"Fallo calibracion de temperatura" +"Fallo de la calibracion de temperatura" #MSG_TEMP_CALIBRATION_DONE c=20 r=12 "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." @@ -1014,6 +1090,10 @@ "Temperatures" "Temperaturas" +#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." +"Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "ACTIVADO" @@ -1040,15 +1120,15 @@ #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" -"fallo volume.init " +"fallo volume.init" #MSG_USERWAIT c=0 r=0 "Wait for user..." -"Esperando ordenes" +"Esperando ordenes..." #MSG_WAITING_TEMP c=20 r=3 "Waiting for nozzle and bed cooling" -"Esperando enfriamiento de la base y extrusor." +"Esperando enfriamiento de la base y extrusor" #MSG_WAITING_TEMP_PINDA c=20 r=3 "Waiting for PINDA probe cooling" @@ -1068,7 +1148,7 @@ #MSG_UNLOAD_SUCCESSFUL c=20 r=2 "Was filament unload successful?" -"Filamento cargado con exito?" +"Se cargocon exito el filamento?" #MSG_SELFTEST_WIRINGERROR c=0 r=0 "Wiring error" @@ -1084,7 +1164,7 @@ #MSG_SD_WRITE_TO_FILE c=0 r=0 "Writing to file: " -"Escribiendo en arch.: " +"Escribiendo al arch.: " #MSG_XYZ_DETAILS c=19 r=1 "XYZ cal. details" @@ -1100,5 +1180,4 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." -"Siempre puedes acceder al asistente desde Calibracion -> Wizard" - +"Siempre puedes acceder al asistente desde Calibracion -> Wizard." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt new file mode 100644 index 00000000..7efd3e56 --- /dev/null +++ b/lang/lang_en_fr.txt @@ -0,0 +1,1184 @@ +#MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 +" [off" +"\x00" + +#MSG_PLANNER_BUFFER_BYTES c=0 r=0 +" PlannerBufferBytes: " +" PlannerBufferBytes : " + +#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 +" cold extrusion prevented" +" extrusion a froid evitee" + +#MSG_FREE_MEMORY c=0 r=0 +" Free Memory: " +" Memoire libre: " + +#MSG_CONFIGURATION_VER c=0 r=0 +" Last Updated: " +" Derniere MAJ: " + +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +" of 4" +" de 4" + +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +" of 9" +" de 9" + +#MSG_MEASURED_OFFSET c=0 r=0 +"[0;0] point offset" +"Offset point [0;0]" + +#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +"\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" +"\x1b[2JLa detection de crash\x1b[1;0Hpeut etre active\x1b[2;0Hqu'en mode Normal" + +#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 +"\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" +"\x1b[2JATTENTION :\x1b[1;0HDetection de crash\x1b[2;0Hdesactivee en mode\x1b[3;0HFurtif" + +#MSG_REFRESH c=0 r=0 +"\xf8Refresh" +"\x00" + +#MSG_BABYSTEPPING_Z c=20 r=0 +"Adjusting Z" +"Ajustement de Z" + +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +"All correct " +"Tout est correct " + +#MSG_WIZARD_DONE c=20 r=8 +"All is done. Happy printing!" +"Tout est termine. Bonne impression !" + +#MSG_PRESS c=20 r=0 +"and press the knob" +"et pressez le bouton" + +#MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +"Are left and right Z~carriages all up?" +"Chariots Z gauche et droite tout en haut?" + +#MSG_ADJUSTZ c=0 r=0 +"Auto adjust Z?" +"Ajustement Z auto ?" + +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"Purge auto [on]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"Purge auto [off]" + +#MSG_AUTO_HOME c=0 r=0 +"Auto home" +"Origine automatique" + +#MSG_AUTOLOAD_FILAMENT c=17 r=0 +"AutoLoad filament" +"AutoCharge du filament" + +#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +"Autoloading filament available only when filament sensor is turned on..." +"AutoCharge du filament uniquement si le capteur de filament est active." + +#MSG_AUTOLOADING_ENABLED c=20 r=4 +"Autoloading filament is active, just press the knob and insert filament..." +"AutoCharge actif, appuyez sur le bouton et inserez le filament." + +#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +"Axis length" +"Longueur de l'axe" + +#MSG_SELFTEST_AXIS c=0 r=0 +"Axis" +"Axe" + +#MSG_SELFTEST_BEDHEATER c=0 r=0 +"Bed / Heater" +"Lit / Chauffage" + +#MSG_BED_DONE c=0 r=0 +"Bed done" +"Lit termine" + +#MSG_BED_HEATING c=0 r=0 +"Bed Heating" +"Chauffe du lit" + +#MSG_BED_CORRECTION_MENU c=0 r=0 +"Bed level correct" +"Correction niveau lit" + +#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 +"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." +"Echec du nivellement. Capt. non declenche. Debris sur buse ? En attente d'un reset." + +#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 +"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." +"Echec du nivellement. Capteur deconnecte ou cable casse. En attente d'un reset." + +#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 +"Bed leveling failed. Sensor triggered too high. Waiting for reset." +"Echec du nivellement. Capt. declenche trop trop haut. En attente d'un reset." + +#MSG_BED c=0 r=0 +"Bed" +"Lit" + +#MSG_BEGIN_FILE_LIST c=0 r=0 +"Begin file list" +"Debut liste fichiers" + +#MSG_MENU_BELT_STATUS c=15 r=1 +"Belt status" +"Statut courroie" + +#MSG_RECOVER_PRINT c=20 r=2 +"Blackout occurred. Recover print?" +"Coupure detectee. Recup. impression ?" + +#MSG_CALIBRATE_BED c=0 r=0 +"Calibrate XYZ" +"Calibrer XYZ" + +#MSG_HOMEYZ c=0 r=0 +"Calibrate Z" +"Calibrer Z" + +#MSG_CALIBRATE_PINDA c=17 r=1 +"Calibrate" +"Calibrer" + +#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." + +#MSG_CALIBRATE_Z_AUTO c=20 r=2 +"Calibrating Z" +"Calibration de 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." +"Calibration de Z. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." + +#MSG_HOMEYZ_DONE c=0 r=0 +"Calibration done" +"Calibration terminee" + +#MSG_MENU_CALIBRATION c=0 r=0 +"Calibration" +"\x00" + +#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 +"Cannot enter subdir: " +"Impossible d'entrer dans le repertoire: " + +#MSG_SD_INSERTED c=0 r=0 +"Card inserted" +"Carte inseree" + +#MSG_SD_REMOVED c=0 r=0 +"Card removed" +"Carte retiree" + +#MSG_NOT_COLOR c=0 r=0 +"Color not correct" +"Couleur incorrecte" + +#MSG_COOLDOWN c=0 r=0 +"Cooldown" +"Refroidissement" + +#MSG_CRASHDETECT_ON c=0 r=0 +"Crash det. [on]" +"Detect.crash [on]" + +#MSG_CRASHDETECT_NA c=0 r=0 +"Crash det. [N/A]" +"Detect.crash[N/A]" + +#MSG_CRASHDETECT_OFF c=0 r=0 +"Crash det. [off]" +"Detect.crash[off]" + +#MSG_CRASH_DETECTED c=20 r=1 +"Crash detected." +"Crash detecte." + +#MSG_CURRENT c=19 r=1 +"Current" +"Actuel" + +#MSG_DATE c=17 r=1 +"Date:" +"Date :" + +#MSG_DISABLE_STEPPERS c=0 r=0 +"Disable steppers" +"Desactiver moteurs" + +#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." +"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." + +#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 lit chauffant ?" + +#MSG_EXTRUDER_CORRECTION c=9 r=0 +"E-correct" +"Correct-E" + +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Ejecter le filament" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Ejecter le filament 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Filament en cours d'ejection" + +#MSG_END_FILE_LIST c=0 r=0 +"End file list" +"Fin liste fichiers" + +#MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 +"Endstop not hit" +"Butee non atteinte" + +#MSG_SELFTEST_ENDSTOP c=0 r=0 +"Endstop" +"Butee" + +#MSG_ENDSTOPS_HIT c=0 r=0 +"endstops hit: " +"butees atteintes: " + +#MSG_SELFTEST_ENDSTOPS c=0 r=0 +"Endstops" +"Butees" + +#MSG_Enqueing c=0 r=0 +"enqueing \x22" +"\x00" + +#MSG_STACK_ERROR c=20 r=4 +"Error - static memory has been overwritten" +"Erreur - la memoire statique a ete ecrasee" + +#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 +"error writing to file" +"erreur d'ecriture du fichier" + +#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 la connexion." + +#MSG_ERROR c=0 r=0 +"ERROR:" +"ERREUR :" + +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +"Extruder fan:" +"Ventilo extrudeur:" + +#MSG_INFO_EXTRUDER c=15 r=1 +"Extruder info" +"Infos extrudeur" + +#MSG_MOVE_E c=0 r=0 +"Extruder" +"Extrudeur" + +#MSG_FSENS_AUTOLOAD_ON c=17 r=1 +"F. autoload [on]" +"AutoCharg F [on]" + +#MSG_FSENS_AUTOLOAD_NA c=17 r=1 +"F. autoload [N/A]" +"AutoCharg F [N/A]" + +#MSG_FSENS_AUTOLOAD_OFF c=17 r=1 +"F. autoload [off]" +"AutoCharg F [off]" + +#MSG_FAN_SPEED c=14 r=0 +"Fan speed" +"Vitesse ventil" + +#MSG_SELFTEST_FAN c=20 r=0 +"Fan test" +"Test ventilateur" + +#MSG_FANS_CHECK_ON c=17 r=1 +"Fans check [on]" +"Verif venti [on]" + +#MSG_FANS_CHECK_OFF c=17 r=1 +"Fans check [off]" +"Verif venti [off]" + +#MSG_FSENSOR_ON c=0 r=0 +"Fil. sensor [on]" +"Capteur Fil. [on]" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"La reponse du capteur de fil. est pauvre, le desactiver ?" + +#MSG_FSENSOR_NA c=0 r=0 +"Fil. sensor [N/A]" +"Capteur Fil.[N/A]" + +#MSG_FSENSOR_OFF c=0 r=0 +"Fil. sensor [off]" +"Capteur Fil.[off]" + +#MSG_FILAMENT_CLEAN c=20 r=2 +"Filament extruding & with correct color?" +"Filament extrude et avec bonne couleur ?" + +#MSG_NOT_LOADED c=19 r=0 +"Filament not loaded" +"Filament non charge" + +#MSG_FILAMENT_SENSOR c=20 r=0 +"Filament sensor" +"Capteur de filament" + +#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 +"Filament sensor:" +"Capteur filament :" + +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Filament utilise" + +#MSG_FILE_INCOMPLETE c=20 r=2 +"File incomplete. Continue anyway?" +"Fichier incomplet. Continuer qd meme ?" + +#MSG_SD_FILE_OPENED c=0 r=0 +"File opened: " +"Fichier ouvert: " + +#MSG_SD_FILE_SELECTED c=0 r=0 +"File selected" +"Fichier selectionne" + +#MSG_FINISHING_MOVEMENTS c=20 r=1 +"Finishing movements" +"Mouvements de fin" + +#MSG_V2_CALIBRATION c=17 r=1 +"First layer cal." +"Cal. 1ere couche" + +#MSG_WIZARD_SELFTEST c=20 r=8 +"First, I will run the selftest to check most common assembly problems." +"D'abord, je vais lancer l'autotest pour verifier les problemes d'assemblage les plus communs." + +#MSG_FLOW c=0 r=0 +"Flow" +"Flux" + +#MSG_PRUSA3D_FORUM c=0 r=0 +"forum.prusa3d.com" +"\x00" + +#MSG_SELFTEST_COOLING_FAN c=20 r=0 +"Front print fan?" +"Ventilo impr avant ?" + +#MSG_BED_CORRECTION_FRONT c=14 r=1 +"Front side[um]" +"Avant [um]" + +#MSG_SELFTEST_FANS c=0 r=0 +"Front/left fans" +"Ventilos avt/gauche" + +#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +"Heater/Thermistor" +"Chauffage/Thermistor" + +#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +"Heating disabled by safety timer." +"Chauffe desactivee par le compteur de securite." + +#MSG_HEATING_COMPLETE c=20 r=0 +"Heating done." +"Chauffe terminee." + +#MSG_HEATING c=0 r=0 +"Heating" +"Chauffe" + +#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 ?" + +#MSG_PRUSA3D_HOWTO c=0 r=0 +"howto.prusa3d.com" +"\x00" + +#MSG_FILAMENTCHANGE c=0 r=0 +"Change filament" +"Changer filament" + +#MSG_CHANGE_SUCCESS c=0 r=0 +"Change success!" +"Changement reussi!" + +#MSG_CORRECTLY c=20 r=0 +"Changed correctly?" +"Change correctement?" + +#MSG_CHANGING_FILAMENT c=20 r=0 +"Changing filament!" +"Changement filament!" + +#MSG_SELFTEST_CHECK_BED c=20 r=0 +"Checking bed " +"Verification du lit " + +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +"Checking endstops" +"Verifications butees" + +#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +"Checking hotend " +"Verif. tete impr. " + +#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +"Checking sensors " +"Verif. des capteurs " + +#MSG_SELFTEST_CHECK_X c=20 r=0 +"Checking X axis " +"Verification axe X " + +#MSG_SELFTEST_CHECK_Y c=20 r=0 +"Checking Y axis " +"Verification axe Y " + +#MSG_SELFTEST_CHECK_Z c=20 r=0 +"Checking Z axis " +"Verification axe Z " + +#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 +"checksum mismatch, Last Line: " +"dissemblance du checksum, Derniere Ligne: " + +#MSG_CHOOSE_EXTRUDER c=20 r=1 +"Choose extruder:" +"Choisir extrudeur :" + +#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." + +#MSG_WIZARD_Z_CAL c=20 r=8 +"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_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +"Improving bed calibration point" +"Amelioration du point de calibration du lit" + +#MSG_WATCH c=0 r=0 +"Info screen" +"Ecran d'informations" + +#MSG_FILAMENT_LOADING_T0 c=20 r=4 +"Insert filament into extruder 1. Click when done." +"Inserez le filament dans l'extrudeur 1. Cliquez une fois fait." + +#MSG_FILAMENT_LOADING_T1 c=20 r=4 +"Insert filament into extruder 2. Click when done." +"Inserez le filament dans l'extrudeur 2. Cliquez une fois fait." + +#MSG_FILAMENT_LOADING_T2 c=20 r=4 +"Insert filament into extruder 3. Click when done." +"Inserez le filament dans l'extrudeur 3. Cliquez une fois fait." + +#MSG_FILAMENT_LOADING_T3 c=20 r=4 +"Insert filament into extruder 4. Click when done." +"Inserez le filament dans l'extrudeur 4. Cliquez une fois fait." + +#MSG_INSERT_FILAMENT c=20 r=0 +"Insert filament" +"Inserez le filament" + +#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +"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 le lit chauffant ?" + +#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 +"Iteration " +"\x00" + +#MSG_KILLED c=0 r=0 +"KILLED. " +"TUE. " + +#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +"Left hotend fan?" +"Ventilo tete gauche?" + +#MSG_BED_CORRECTION_LEFT c=14 r=1 +"Left side [um]" +"Gauche [um]" + +#MSG_BABYSTEP_Z c=0 r=0 +"Live adjust Z" +"Ajustement Z en direct" + +#MSG_LOAD_FILAMENT c=17 r=0 +"Load filament" +"Charger filament" + +#MSG_LOADING_COLOR c=0 r=0 +"Loading color" +"Chargement couleur" + +#MSG_LOADING_FILAMENT c=20 r=0 +"Loading filament" +"Chargement filament" + +#MSG_LOOSE_PULLEY c=20 r=1 +"Loose pulley" +"Poulie lache" + +#MSG_M104_INVALID_EXTRUDER c=0 r=0 +"M104 Invalid extruder " +"M104 extrudeur invalide " + +#MSG_M105_INVALID_EXTRUDER c=0 r=0 +"M105 Invalid extruder " +"M105 extrudeur invalide " + +#MSG_M109_INVALID_EXTRUDER c=0 r=0 +"M109 Invalid extruder " +"M109 extrudeur invalide " + +#MSG_M117_V2_CALIBRATION c=25 r=1 +"M117 First layer cal." +"M117 Cal. 1ere couche" + +#MSG_M200_INVALID_EXTRUDER c=0 r=0 +"M200 Invalid extruder " +"M200 extrudeur invalide " + +#MSG_M218_INVALID_EXTRUDER c=0 r=0 +"M218 Invalid extruder " +"M218 extrudeur invalide " + +#MSG_M221_INVALID_EXTRUDER c=0 r=0 +"M221 Invalid extruder " +"M221 extrudeur invalide " + +#MSG_MAIN c=0 r=0 +"Main" +"Principal" + +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +"Measuring reference height of calibration point" +"Mesure de la hauteur de reference du point de calibration" + +#MSG_MESH_BED_LEVELING c=0 r=0 +"Mesh Bed Leveling" +"Nivelage du lit par maillage" + +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"La MMU requiert votre attention. Reglez le probleme puis appuyez sur le bouton on sur l'unite MMU." + +#MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +"MMU OK. Resuming position..." +"MMU OK. Reprise de la position ..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Reprise de la temperature ..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Reprise ..." + +#MSG_STEALTH_MODE_OFF c=0 r=0 +"Mode [Normal]" +"Mode [Normal]" + +#MSG_SILENT_MODE_ON c=0 r=0 +"Mode [silent]" +"Mode [silencieux]" + +#MSG_STEALTH_MODE_ON c=0 r=0 +"Mode [Stealth]" +"Mode [Furtif]" + +#MSG_AUTO_MODE_ON c=0 r=0 +"Mode [auto power]" +"Mode [puiss.auto]" + +#MSG_SILENT_MODE_OFF c=0 r=0 +"Mode [high power]" +"Mode[haute puiss]" + +#MSG_SELFTEST_MOTOR c=0 r=0 +"Motor" +"Moteur" + +#MSG_MOVE_AXIS c=0 r=0 +"Move axis" +"Deplacer l'axe" + +#MSG_MOVE_X c=0 r=0 +"Move X" +"Deplacer X" + +#MSG_MOVE_Y c=0 r=0 +"Move Y" +"Deplacer Y" + +#MSG_MOVE_Z c=0 r=0 +"Move Z" +"Deplacer Z" + +#MSG_ERR_NO_CHECKSUM c=0 r=0 +"No Checksum with line number, Last Line: " +"Pas de checksum avec numero de ligne, Derniere ligne: " + +#MSG_NO_MOVE c=0 r=0 +"No move." +"Pas de mouvement." + +#MSG_NO_CARD c=0 r=0 +"No SD card" +"Pas de carte SD" + +#MSG_NO c=0 r=0 +"No" +"Non" + +#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +"Not connected" +"Non connecte" + +#MSG_SELFTEST_FAN_NO c=19 r=0 +"Not spinning" +"Ne tourne pas" + +#MSG_WIZARD_V2_CAL c=20 r=8 +"Now I will calibrate distance between tip of the nozzle and heatbed surface." +"Maintenant je vais calibrer la distance entre la pointe de la buse et le surface du lit chauffant." + +#MSG_WIZARD_WILL_PREHEAT c=20 r=4 +"Now I will preheat nozzle for PLA." +"Maintenant je vais prechauffer la buse pour du PLA." + +#MSG_NOZZLE c=0 r=0 +"Nozzle" +"Buse" + +#MSG_OK c=0 r=0 +"ok" +"\x00" + +#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 +"Old settings found. Default PID, Esteps etc. will be set." +"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." + +#MSG_SD_OPEN_FILE_FAIL c=0 r=0 +"open failed, File: " +"Echec ouverture, Fichier: " + +#MSG_ENDSTOP_OPEN c=0 r=0 +"open" +"ouvrir" + +#MSG_SD_OPENROOT_FAIL c=0 r=0 +"openRoot failed" +"Echec openRoot" + +#MSG_PAUSE_PRINT c=0 r=0 +"Pause print" +"Mettre en pause l'impression" + +#MSG_PID_RUNNING c=20 r=1 +"PID cal. " +"Calib. PID " + +#MSG_PID_FINISHED c=20 r=1 +"PID cal. finished" +"Calib. PID terminee" + +#MSG_PID_EXTRUDER c=17 r=1 +"PID calibration" +"Calibration PID" + +#MSG_PINDA_PREHEAT c=20 r=1 +"PINDA Heating" +"Chauffe de la PINDA" + +#MSG_PAPER c=20 r=8 +"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." +"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." + +#MSG_WIZARD_CLEAN_HEATBED c=20 r=8 +"Please clean heatbed and then press the knob." +"Nettoyez le lit chauffant et appuyez sur le bouton." + +#MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +"Please clean the nozzle for calibration. Click when done." +"Nettoyez la buse pour la calibration. Cliquez une fois fait." + +#MSG_SELFTEST_PLEASECHECK c=0 r=0 +"Please check :" +"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." + +#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_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8 +"Please load PLA filament and then resume Wizard by rebooting the printer." +"Chargez le filament PLA et poursuivez l'assistant en redemarrant l'imprimante." + +#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 le support de poulie et retirez le filament manuellement." + +#MSG_PLACE_STEEL_SHEET c=20 r=4 +"Please place steel sheet on heatbed." +"Placez la feuille d'acier sur le lit chauffant." + +#MSG_PRESS_TO_UNLOAD c=20 r=4 +"Please press the knob to unload filament" +"Appuyez sur le bouton pour decharger le filament" + +#MSG_PULL_OUT_FILAMENT c=20 r=4 +"Please pull out filament immediately" +"Retirez immediatement le filament" + +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Veuillez retirer le filament puis appuyez sur le bouton." + +#MSG_REMOVE_STEEL_SHEET c=20 r=4 +"Please remove steel sheet from heatbed." +"Retirez la feuille d'acier du lit chauffant." + +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Veuillez d'abord lancer la calibration XYZ." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Veuillez mettre a jour le firmware de votre MMU2. En attente d'un reset." + +#MSG_PLEASE_WAIT c=20 r=0 +"Please wait" +"Merci de patienter" + +#MSG_POWERUP c=0 r=0 +"PowerUp" +"Demarrage" + +#MSG_PREHEAT_NOZZLE c=20 r=0 +"Preheat the nozzle!" +"Prechauffez la buse!" + +#MSG_PREHEAT c=0 r=0 +"Preheat" +"Prechauffage" + +#MSG_WIZARD_HEATING c=20 r=3 +"Preheating nozzle. Please wait." +"Prechauffage de la buse. Merci de patienter." + +#MSG_PRESS_TO_PREHEAT c=20 r=4 +"Press knob to preheat nozzle and continue." +"Appuyez sur le bouton pour prechauffer la buse et continuer." + +#MSG_PRINT_ABORTED c=20 r=0 +"Print aborted" +"Impression annulee" + +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +"Print fan:" +"Ventilo impr. :" + +#MSG_CARD_MENU c=0 r=0 +"Print from SD" +"Imprimer depuis la SD" + +#MSG_PRINT_PAUSED c=20 r=1 +"Print paused" +"Impression en pause" + +#MSG_ERR_KILLED c=0 r=0 +"Printer halted. kill() called!" +"Imprimante stoppee. kill() appelee !" + +#MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." +"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration" + +#MSG_ERR_STOPPED c=0 r=0 +"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" +"Imprimante arretee a cause d'erreurs. Corrigez l'erreur et utilisez M999 pour redemarrer. (La temperature est reinitilisee. Parametrez la apres le redemarrage)" + +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK3 ready." +"Prusa i3 MK3 prete." + +#MSG_PRUSA3D c=0 r=0 +"prusa3d.com" +"\x00" + +#MSG_BED_CORRECTION_REAR c=14 r=1 +"Rear side [um]" +"Arriere [um]" + +#MSG_RECOVERING_PRINT c=20 r=1 +"Recovering print " +"Recup. impression " + +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau." + +#MSG_M119_REPORT c=0 r=0 +"Reporting endstop status" +"Retour du statut des butees" + +#MSG_CALIBRATE_BED_RESET c=0 r=0 +"Reset XYZ calibr." +"Reinit. calibr. XYZ" + +#MSG_BED_CORRECTION_RESET c=0 r=0 +"Reset" +"Reinitialiser" + +#MSG_RESUME_PRINT c=0 r=0 +"Resume print" +"Reprendre impression" + +#MSG_RESUMING_PRINT c=20 r=1 +"Resuming print" +"Reprise de l'impr." + +#MSG_BED_CORRECTION_RIGHT c=14 r=1 +"Right side[um]" +"Droite [um]" + +#MSG_SECOND_SERIAL_ON c=17 r=1 +"RPi port [on]" +"Port RPi [on]" + +#MSG_SECOND_SERIAL_OFF c=17 r=1 +"RPi port [off]" +"Port RPi [off]" + +#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 ?" + +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 +"SD card [normal]" +"Carte SD [normal]" + +#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 +"SD card [FlshAir]" +"Carte SD[FlshAir]" + +#MSG_SD_CARD_OK c=0 r=0 +"SD card ok" +"Carte SD ok" + +#MSG_SD_INIT_FAIL c=0 r=0 +"SD init fail" +"Echec init SD" + +#MSG_SD_PRINTING_BYTE c=0 r=0 +"SD printing byte " +"Octet d'impression de la SD " + +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +"Searching bed calibration point" +"Recherche du point de calibration du lit" + +#MSG_LANGUAGE_SELECT c=0 r=0 +"Select language" +"Choisir langue" + +#MSG_SELFTEST_OK c=0 r=0 +"Self test OK" +"Auto-test OK" + +#MSG_SELFTEST_START c=20 r=0 +"Self test start " +"Debut auto-test " + +#MSG_SELFTEST c=0 r=0 +"Selftest " +"Auto-test " + +#MSG_SELFTEST_ERROR c=0 r=0 +"Selftest error !" +"Erreur auto-test !" + +#MSG_SELFTEST_FAILED c=20 r=0 +"Selftest failed " +"Echec de l'auto-test " + +#MSG_FORCE_SELFTEST c=20 r=8 +"Selftest will be run to calibrate accurate sensorless rehoming." +"L'auto-test sera lance pour calibrer la remise a zero precise sans capteur." + +#MSG_SET_TEMPERATURE c=19 r=1 +"Set temperature:" +"Regler temp. :" + +#MSG_SETTINGS c=0 r=0 +"Settings" +"Reglages" + +#MSG_SHOW_END_STOPS c=17 r=1 +"Show end stops" +"Afficher butees" + +#MSG_DWELL c=0 r=0 +"Sleep..." +"Repos..." + +#MSG_FILE_CNT c=20 r=4 +"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." +"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." + +#MSG_SORT_NONE c=17 r=1 +"Sort: [none]" +"\x00" + +#MSG_SORT_TIME c=17 r=1 +"Sort: [time]" +"\x00" + +#MSG_SORT_ALPHA c=17 r=1 +"Sort: [alphabet]" +"Tri : [alphabet]" + +#MSG_SORTING c=20 r=1 +"Sorting files" +"Tri des fichiers" + +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Son [fort]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Son [muet]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Son [une fois]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Son [silencieux]" + +#MSG_SPEED c=0 r=0 +"Speed" +"Vitesse" + +#MSG_SELFTEST_FAN_YES c=19 r=0 +"Spinning" +"Tourne" + +#MSG_TEMP_CAL_WARNING c=20 r=4 +"Stable ambient temperature 21-26C is needed a rigid stand is required." +"Une temperature ambiante stable de 21-26C et une base stable sont requis." + +#MSG_STATISTICS c=0 r=0 +"Statistics " +"Statistiques " + +#MSG_STEPPER_TOO_HIGH c=0 r=0 +"Steprate too high: " +"Nombre de pas trop eleve: " + +#MSG_STOP_PRINT c=0 r=0 +"Stop print" +"Arreter impression" + +#MSG_STOPPED c=0 r=0 +"STOPPED. " +"ARRETE. " + +#MSG_SUPPORT c=0 r=0 +"Support" +"\x00" + +#MSG_SELFTEST_SWAPPED c=0 r=0 +"Swapped" +"Echange" + +#MSG_TEMP_CALIBRATION c=20 r=1 +"Temp. cal. " +"Calib. Temp. " + +#MSG_TEMP_CALIBRATION_ON c=20 r=1 +"Temp. cal. [on]" +"Calib. Temp. [on]" + +#MSG_TEMP_CALIBRATION_OFF c=20 r=1 +"Temp. cal. [off]" +"Calib. Temp.[off]" + +#MSG_CALIBRATION_PINDA_MENU c=17 r=1 +"Temp. calibration" +"Calibration temp." + +#MSG_TEMP_CAL_FAILED c=20 r=8 +"Temperature calibration failed" +"Echec calibration en temperature" + +#MSG_TEMP_CALIBRATION_DONE c=20 r=12 +"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." +"La calibration en temperature est terminee et active. La calibration en temperature peut etre desactivee dans le menu Reglages->Cal. Temp." + +#MSG_TEMPERATURE c=0 r=0 +"Temperature" +"\x00" + +#MSG_MENU_TEMPERATURES c=15 r=1 +"Temperatures" +"\x00" + +#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." + +#MSG_ENDSTOP_HIT c=0 r=0 +"TRIGGERED" +"ACTIVE" + +#MSG_TUNE c=0 r=0 +"Tune" +"Regler" + +#MSG_UNLOAD_FILAMENT c=17 r=0 +"Unload filament" +"Decharger fil." + +#MSG_UNLOADING_FILAMENT c=20 r=1 +"Unloading filament" +"Dechargement fil." + +#MSG_USED c=19 r=1 +"Used during print" +"Utilise pdt impr." + +#MSG_MENU_VOLTAGES c=15 r=1 +"Voltages" +"Tensions" + +#MSG_SD_VOL_INIT_FAIL c=0 r=0 +"volume.init failed" +"Echec volume.init" + +#MSG_USERWAIT c=0 r=0 +"Wait for user..." +"Attente utilisateur..." + +#MSG_WAITING_TEMP c=20 r=3 +"Waiting for nozzle and bed cooling" +"Attente du refroidissement de la buse et du lit" + +#MSG_WAITING_TEMP_PINDA c=20 r=3 +"Waiting for PINDA probe cooling" +"Attente du refroidissement de la sonde PINDA" + +#MSG_CHANGED_BOTH c=20 r=4 +"Warning: both printer type and motherboard type changed." +"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." + +#MSG_CHANGED_PRINTER c=20 r=4 +"Warning: printer type changed." +"Attention : Type d'imprimante modifie." + +#MSG_UNLOAD_SUCCESSFUL c=20 r=2 +"Was filament unload successful?" +"Dechargement du filament reussi ?" + +#MSG_SELFTEST_WIRINGERROR c=0 r=0 +"Wiring error" +"Erreur de cablage" + +#MSG_WIZARD c=17 r=1 +"Wizard" +"Assistant" + +#MSG_SD_WORKDIR_FAIL c=0 r=0 +"workDir open failed" +"Echec ouverture workDir" + +#MSG_SD_WRITE_TO_FILE c=0 r=0 +"Writing to file: " +"Ecriture dans le fichier: " + +#MSG_XYZ_DETAILS c=19 r=1 +"XYZ cal. details" +"Details calib. XYZ" + +#MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +"XYZ calibration failed. Please consult the manual." +"Echec calibration XYZ. Consultez le manuel." + +#MSG_YES c=0 r=0 +"Yes" +"Oui" + +#MSG_WIZARD_QUIT c=20 r=8 +"You can always resume the Wizard from Calibration -> Wizard." +"Vous pouvez toujours poursuivre l'assistant dans Calibration-> Assistant." + diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index a522e58e..02462669 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -8,15 +8,15 @@ #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" -"estrusione a freddo non consentita" +" evitata estrusione fredda" #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " -"Memoria Libera: " +" Memoria Libera: " #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " -"Ultimo aggiornamento: " +" Ultimo aggiornamento: " #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 " of 4" @@ -28,19 +28,19 @@ #MSG_MEASURED_OFFSET c=0 r=0 "[0;0] point offset" -"[0;0] punto traslato" +"[0;0] punto offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -"\x1b[2JRilevamento Crash\x1b[1;0Hdisponibile solo in\x1b[2;0HModalita' Normale" +"\x1b[2JRilev. impatto\x1b[1;0Hattivabile solo\x1b[2;0Hin Modalita normale" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -"\x1b[2JATTENZIONE:\x1b[1;0HRilevamento Crash\x1b[2;0Hnon attivo in\x1b[3;0HModalita' Silenzioso" +"\x1b[2JATTENZIONE:\x1b[1;0HRilev. impatto\x1b[2;0Hdisattivato in\x1b[3;0HModalita silenziosa" #MSG_REFRESH c=0 r=0 "\xf8Refresh" -"\xf8Riavvio" +"\x00" #MSG_BABYSTEPPING_Z c=20 r=0 "Adjusting Z" @@ -48,7 +48,7 @@ #MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 "All correct " -"Nessun errore" +"Nessun errore " #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" @@ -60,27 +60,35 @@ #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 "Are left and right Z~carriages all up?" -"Carrelli Z sx/dx ad altezza massima?" +"I carrelli Z sin/des sono altezza max?" #MSG_ADJUSTZ c=0 r=0 "Auto adjust Z?" "Autoregolare Z?" +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"Esaurim.auto [on]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"Esaurim.auto[off]" + #MSG_AUTO_HOME c=0 r=0 "Auto home" "Trova origine" #MSG_AUTOLOAD_FILAMENT c=17 r=0 "AutoLoad filament" -"AutoCarica filam." +"Autocaric. filam." #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Auto caricamento del filamento solamente disponibile con sensore e acceso..." +"Caricamento auto. filam. disp. solo con il sensore attivo..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -"Auto carica attiva, premere la manopola per poter inserire il filamento..." +"Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." #MSG_SELFTEST_AXIS_LENGTH c=0 r=0 "Axis length" @@ -88,35 +96,35 @@ #MSG_SELFTEST_AXIS c=0 r=0 "Axis" -"Asse" +"Assi" #MSG_SELFTEST_BEDHEATER c=0 r=0 "Bed / Heater" -"Letto/Riscaldatore" +"Letto / Riscald" #MSG_BED_DONE c=0 r=0 "Bed done" -"Letto pronto" +"Piano fatto." #MSG_BED_HEATING c=0 r=0 "Bed Heating" -"Riscaldamento letto" +"Riscald. letto" #MSG_BED_CORRECTION_MENU c=0 r=0 "Bed level correct" -"Correzione letto" +"Correz. liv.letto" #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -"Livellamento letto fallito. No segnale. Residui sull'ugello? Riavviare prego." +"Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset." #MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Livellamento letto fallito. Sensore disconnesso o rotto. Riavviare prego." +"Livellamento piano fallito. Sensore disconnesso o Cavo Danneggiato. In attesa di reset." #MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 "Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Livellamento letto fallito. Risposta sensore precoce. Riavviare prego." +"Livellamento piano fallito. Risposta sensore troppo presto. In attesa di reset." #MSG_BED c=0 r=0 "Bed" @@ -128,11 +136,11 @@ #MSG_MENU_BELT_STATUS c=15 r=1 "Belt status" -"Stato cinghie" +"Stato delle cinghie" #MSG_RECOVER_PRINT c=20 r=2 "Blackout occurred. Recover print?" -"Blackout rilevato. Ripristinare stampa?" +"C'e stato un Blackout. Recuperare la stampa?" #MSG_CALIBRATE_BED c=0 r=0 "Calibrate XYZ" @@ -148,7 +156,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." -"Calibrazione XYZ. Ruotare la manopola per muovere in alto il carrello Z fino All'altezza massima. Click al termine." +"Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." #MSG_CALIBRATE_Z_AUTO c=20 r=2 "Calibrating Z" @@ -156,11 +164,11 @@ #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." -"Calibrazione Z. Ruotare la manopola per muovere in alto il carrello Z fino all'altezza massima. Click al termine." +"Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." #MSG_HOMEYZ_DONE c=0 r=0 "Calibration done" -"Calibrazione OK" +"Calibrazione completa" #MSG_MENU_CALIBRATION c=0 r=0 "Calibration" @@ -188,19 +196,19 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Rileva Crash [on]" +"Rilevam.imp. [on]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Rileva Crash [N/D]" +"Rilevam.imp.[N/A]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Rileva Crash [off]" +"Rilevam.imp.[off]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." -"Crash rilevato." +"Rilevato impatto." #MSG_CURRENT c=19 r=1 "Current" @@ -216,15 +224,27 @@ #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." -"Distanza tra punta dell'ugello e superficie del letto non ancora imposta. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calib. primo strato." +"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 "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -"Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e letto?" +"Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e piatto?" #MSG_EXTRUDER_CORRECTION c=9 r=0 "E-correct" -"Correz-E" +"Correzione-E" + +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Espelli filamento" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Espelli filamento 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Espellendo filamento" #MSG_END_FILE_LIST c=0 r=0 "End file list" @@ -232,7 +252,7 @@ #MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 "Endstop not hit" -"Finec. fuori por." +"Finecorsa fuori portata" #MSG_SELFTEST_ENDSTOP c=0 r=0 "Endstop" @@ -248,7 +268,7 @@ #MSG_Enqueing c=0 r=0 "enqueing \x22" -"aggiunta in coda \x22" +"\x00" #MSG_STACK_ERROR c=20 r=4 "Error - static memory has been overwritten" @@ -256,11 +276,11 @@ #MSG_SD_ERR_WRITE_TO_FILE c=0 r=0 "error writing to file" -"errore scrittura su file" +"errore scrittura sul file" #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." -"ERRORE: il sensore del filamento non risponde. Verificare la connessione prego" +"ERRORE: il sensore filam. non risponde, Controllare conness." #MSG_ERROR c=0 r=0 "ERROR:" @@ -280,19 +300,19 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"AutoCarica [on]" +"Autocaric.f. [on]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"AutoCarica [N/D]" +"Autocaric.f.[N/A]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"AutoCarica [off]" +"Autocaric.f.[off]" #MSG_FAN_SPEED c=14 r=0 "Fan speed" -"Vel. ventola" +"Velocita ventola" #MSG_SELFTEST_FAN c=20 r=0 "Fan test" @@ -300,27 +320,31 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Cont. vent. [on]" +"Controllo ven[on]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Cont. vent. [off]" +"Controllo v.[off]" #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Sens. filamento [on]" +"Sensore fil. [On]" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"Risposta Sens. Fil. debole, disattivare?" #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" -"Sens. filamento [N/D]" +"Sensore fil.[N/A]" #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" -"Sens. filamento [off]" +"Sensore fil.[off]" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Filamento estruso? Con colore giusto?" +"Filamento estruso & con il giusto colore?" #MSG_NOT_LOADED c=19 r=0 "Filament not loaded" @@ -328,11 +352,15 @@ #MSG_FILAMENT_SENSOR c=20 r=0 "Filament sensor" -"Sensore filamento" +"Sensore filam." #MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 "Filament sensor:" -"Sens. filamento:" +"Sensore filam.:" + +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Filamento utilizzato" #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -348,15 +376,15 @@ #MSG_FINISHING_MOVEMENTS c=20 r=1 "Finishing movements" -"Finalizzando movim." +"Finalizzando gli spostamenti" #MSG_V2_CALIBRATION c=17 r=1 "First layer cal." -"Cal. primo layer" +"Calibrazione primo layer." #MSG_WIZARD_SELFTEST c=20 r=8 "First, I will run the selftest to check most common assembly problems." -"Per primo avviero' l'autotest per controllare gli errori piu' comuni." +"Per primo avviero l'autotest per controllare gli errori di assemblaggio piu comuni." #MSG_FLOW c=0 r=0 "Flow" @@ -368,7 +396,7 @@ #MSG_SELFTEST_COOLING_FAN c=20 r=0 "Front print fan?" -"Vent. stampa front.?" +"Ventola frontale?" #MSG_BED_CORRECTION_FRONT c=14 r=1 "Front side[um]" @@ -376,27 +404,27 @@ #MSG_SELFTEST_FANS c=0 r=0 "Front/left fans" -"Ventole front/sx" +"Ventola frontale/sinistra" #MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 "Heater/Thermistor" -"Riscaldat./Termist." +"Riscald./Termist." #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." -"Riscaldamento interrotto dal timer di sicurezza." +"Riscaldamento fermato dal timer di sicurezza." #MSG_HEATING_COMPLETE c=20 r=0 "Heating done." -"Riscaldam. completo" +"Riscald. completo." #MSG_HEATING c=0 r=0 "Heating" -"Riscaldamento." +"Riscaldamento" #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?" -"Ciao, sono la tua stampante Original Prusa i3. Gradiresti aiuto nel processo di configurazione?" +"Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" #MSG_PRUSA3D_HOWTO c=0 r=0 "howto.prusa3d.com" @@ -412,15 +440,15 @@ #MSG_CORRECTLY c=20 r=0 "Changed correctly?" -"Cambio corretto?" +"Cambiato correttamente?" #MSG_CHANGING_FILAMENT c=20 r=0 "Changing filament!" -"Cambiando filamento" +"Cambiando filam." #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"Verifica letto " +"Verifica piano " #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" @@ -428,27 +456,27 @@ #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " -"Verifica ugello" +"Verifica ugello " #MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 "Checking sensors " -"Controllo sensori" +"Controllo sensori " #MSG_SELFTEST_CHECK_X c=20 r=0 "Checking X axis " -"Verifica asse X" +"Verifica asse X " #MSG_SELFTEST_CHECK_Y c=20 r=0 "Checking Y axis " -"Verifica asse Y" +"Verifica asse Y " #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -"Verifica asse Z" +"Verifica asse Z " #MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 "checksum mismatch, Last Line: " -"\x00" +"mancata corrispondenza di checksum, ultima riga: " #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" @@ -456,19 +484,19 @@ #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." -"Adesso avviero' una Calibrazione XYZ. Durata prevista 12 minunti." +"Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." #MSG_WIZARD_Z_CAL c=20 r=8 "I will run z calibration now." -"Adesso avviero' la Calibrazione Z." +"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 far abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere un'altezza ottimale. Osservare immagine del nostro manuale prego, capitolo Calibrazione." +"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 r=0 "Improving bed calibration point" -"Perfezionamento del punto di calibrazione sul letto" +"Perfezion. punto di calibraz. letto" #MSG_WATCH c=0 r=0 "Info screen" @@ -476,19 +504,19 @@ #MSG_FILAMENT_LOADING_T0 c=20 r=4 "Insert filament into extruder 1. Click when done." -"Inserire filamento nell'estrusore 1. Fare click al temine." +"Inserire filamento nell'estrusore 1. Click per continuare" #MSG_FILAMENT_LOADING_T1 c=20 r=4 "Insert filament into extruder 2. Click when done." -"Inserire filamento nell'estrusore 2. Fare click al temine." +"Inserire filamento nell'estrusore 2. Click per continuare" #MSG_FILAMENT_LOADING_T2 c=20 r=4 "Insert filament into extruder 3. Click when done." -"Inserire filamento nell'estrusore 3. Fare click al temine." +"Inserire filamento nell'estrusore 3. Click per continuare" #MSG_FILAMENT_LOADING_T3 c=20 r=4 "Insert filament into extruder 4. Click when done." -"Inserire filamento nell'estrusore 4. Fare click al temine." +"Inserire filamento nell'estrusore 4. Click per continuare" #MSG_INSERT_FILAMENT c=20 r=0 "Insert filament" @@ -500,31 +528,31 @@ #MSG_WIZARD_PLA_FILAMENT c=20 r=2 "Is it PLA filament?" -"E' questo un filamento di PLA?" +"E' un filamento di PLA?" #MSG_PLA_FILAMENT_LOADED c=20 r=2 "Is PLA filament loaded?" -"E' stato caricato filamento di PLA?" +"E' stato caricato il filamento di PLA?" #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -"Il foglio d'acciaio giace sul piatto?" +"La piastra d'acciaio e sul piano riscaldato?" #MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 "Iteration " -"Iterazione" +"Iterazione " #MSG_KILLED c=0 r=0 "KILLED. " -"IN TILT." +"IN TILT. " #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" -"Vent sx ugello?" +"Vent SX hotend?" #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" -"Lato sx [um]" +"Lato sinistro [um]" #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" @@ -548,31 +576,31 @@ #MSG_M104_INVALID_EXTRUDER c=0 r=0 "M104 Invalid extruder " -"\x00" +"M104 Estrusore non valido " #MSG_M105_INVALID_EXTRUDER c=0 r=0 "M105 Invalid extruder " -"\x00" +"M105 Estrusore non valido " #MSG_M109_INVALID_EXTRUDER c=0 r=0 "M109 Invalid extruder " -"\x00" +"M109 Estrusore non valido " #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." -"\x00" +"M117 Calibrazione primo layer." #MSG_M200_INVALID_EXTRUDER c=0 r=0 "M200 Invalid extruder " -"\x00" +"M200 Estrusore non valido " #MSG_M218_INVALID_EXTRUDER c=0 r=0 "M218 Invalid extruder " -"\x00" +"M218 Estrusore non valido " #MSG_M221_INVALID_EXTRUDER c=0 r=0 "M221 Invalid extruder " -"\x00" +"M221 Estrusore non valido " #MSG_MAIN c=0 r=0 "Main" @@ -580,11 +608,27 @@ #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 "Measuring reference height of calibration point" -"Misurando altezza di riferimento del punto di calibrazione" +"Misura altezza di rif. del punto di calib." #MSG_MESH_BED_LEVELING c=0 r=0 "Mesh Bed Leveling" -"Livellam. Mesh letto" +"Mesh livel. letto" + +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"MMU richiede l'attenzione dell'utente. Risolvi il problema e quindi premi il bottone sull'unita MMU." + +#MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +"MMU OK. Resuming position..." +"MMU OK. riprendendo la posizione..." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Ripristino temperatura..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Riprendendo..." #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" @@ -596,11 +640,11 @@ #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Modo [Silenzioso]" +"Modo [Silenziosa]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" -"Modo [auto]" +"Modo [auto]" #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" @@ -628,7 +672,7 @@ #MSG_ERR_NO_CHECKSUM c=0 r=0 "No Checksum with line number, Last Line: " -"\x00" +"Nessun checksum con numero di riga, ultima riga: " #MSG_NO_MOVE c=0 r=0 "No move." @@ -652,11 +696,11 @@ #MSG_WIZARD_V2_CAL c=20 r=8 "Now I will calibrate distance between tip of the nozzle and heatbed surface." -"Adesso calibrero' l'altezza dell'ugello sul piatto." +"Adesso calibro la distanza fra ugello e superfice del piatto." #MSG_WIZARD_WILL_PREHEAT c=20 r=4 "Now I will preheat nozzle for PLA." -"Adesso riscaldero' l'ugello per il PLA." +"Adesso preriscaldero l'ugello per PLA." #MSG_NOZZLE c=0 r=0 "Nozzle" @@ -664,11 +708,11 @@ #MSG_OK c=0 r=0 "ok" -"ok" +"\x00" #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 "Old settings found. Default PID, Esteps etc. will be set." -"Impostaz. trovate. I valori di default PID, Esteps etc... saranno impostati." +"Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati." #MSG_SD_OPEN_FILE_FAIL c=0 r=0 "open failed, File: " @@ -680,7 +724,7 @@ #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" -"\x00" +"openRoot fallito" #MSG_PAUSE_PRINT c=0 r=0 "Pause print" @@ -688,7 +732,7 @@ #MSG_PID_RUNNING c=20 r=1 "PID cal. " -"Calibrazione PID" +"Calibrazione PID. " #MSG_PID_FINISHED c=20 r=1 "PID cal. finished" @@ -704,11 +748,11 @@ #MSG_PAPER c=20 r=8 "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." -"Porre un foglio di carta sotto l'ugello durante la ricerca dei primi 4 punti. In caso l'ugello muova il foglio spegnere prontamente la stampante." +"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 "Please clean heatbed and then press the knob." -"Si prega di pulire il piatto, poi premere la manopola." +"Per favore pulisci il piatto, poi premi la manopola." #MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 "Please clean the nozzle for calibration. Click when done." @@ -716,55 +760,67 @@ #MSG_SELFTEST_PLEASECHECK c=0 r=0 "Please check :" -"Prego verificare:" +"Verifica:" #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." -"Per favore consulta il manuale per la risoluzione. Poi riprendere il Wizard dopo aver riavviato la stampante." +"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." -"Inserire del filamento di PLA nell'estrusore e premere la manopola per far si che venga caricato." +"Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare." #MSG_WIZARD_INSERT_CORRECT_FILAMENT c=20 r=8 "Please load PLA filament and then resume Wizard by rebooting the printer." -"Si prega di caricare filamento di PLA e di riprendere il Wizard facendo un riavvio della stampante." +"Per favore carica filamento di PLA e riprendi il Wizard dopo aver riavviato la stampante." #MSG_PLEASE_LOAD_PLA c=20 r=4 "Please load PLA filament first." -"Si prega di caricare filamento di PLA prima di continuare." +"Per favore prima carica il filamento di PLA." #MSG_CHECK_IDLER c=20 r=4 "Please open idler and remove filament manually." -"Aprire sportello a lato dell'estrusore per rimuovere a mano il filamento." +"Aprire la guida filam. e rimuovere il filam. a mano" #MSG_PLACE_STEEL_SHEET c=20 r=4 "Please place steel sheet on heatbed." -"Si prega di disporre il foglio d'acciaio sul letto di stampa." +"Per favore posizionate la piastra d'acciaio sul piano riscaldato." #MSG_PRESS_TO_UNLOAD c=20 r=4 "Please press the knob to unload filament" -"Premere manopola per scaricare filamento" +"Premete la manopola per scaricare il filamento" #MSG_PULL_OUT_FILAMENT c=20 r=4 "Please pull out filament immediately" -"Estrarre filamento immediatamente." +"Estrarre il filamento immediatamente" + +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Rimuovi il filamento e quindi premi la manopola." #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." -"Prega rimuovere il foglio d'acciaio dal letto di stampa." +"Rimuovete la piastra di acciaio dal piano riscaldato." + +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Esegui la calibrazione XYZ prima." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Aggiorna il firmware sul tuo MMU2. In attesa di reset." #MSG_PLEASE_WAIT c=20 r=0 "Please wait" -"Attendere prego" +"Attendere" #MSG_POWERUP c=0 r=0 "PowerUp" -"Accensione" +"Accendi" #MSG_PREHEAT_NOZZLE c=20 r=0 "Preheat the nozzle!" -"Preriscalda ugello!" +"Prerisc. ugello!" #MSG_PREHEAT c=0 r=0 "Preheat" @@ -776,7 +832,7 @@ #MSG_PRESS_TO_PREHEAT c=20 r=4 "Press knob to preheat nozzle and continue." -"Premere la manopola per preriscaldare l'ugello e poter proseguire." +"Premete la manopola per preriscaldare l'ugello e continuare." #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" @@ -796,15 +852,15 @@ #MSG_ERR_KILLED c=0 r=0 "Printer halted. kill() called!" -"\x00" +"Stampante ferma. kill () chiamato!" #MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." -"Stampante non ancora calibrata. Prego seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." +"Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." #MSG_ERR_STOPPED c=0 r=0 "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" -"La stampante si e' fermata a causa di errori. Correggere errore e usare M999 per riavviare. (La temperatura viene azzerata. Riavviare e reimpostare.)" +"La stampante si e fermata a causa di errori. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)" #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." @@ -820,15 +876,19 @@ #MSG_RECOVERING_PRINT c=20 r=1 "Recovering print " -"Recupero stampa " +"Recupero stampa " + +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento." #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" -"Mostra stato finecorsa" +"Segnalazione dello stato finecorsa" #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." -"Reset Calib. XYZ" +"Reset calibrazione XYZ." #MSG_BED_CORRECTION_RESET c=0 r=0 "Reset" @@ -840,19 +900,19 @@ #MSG_RESUMING_PRINT c=20 r=1 "Resuming print" -"Recupero stampa" +"Riprendi stampa" #MSG_BED_CORRECTION_RIGHT c=14 r=1 "Right side[um]" -"Lato dx [um]" +"Destra [um]" #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"Porta RPi [on]" +"Porta RPi [on]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"Porta RPi [off]" +"Porta RPi [off]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -860,27 +920,27 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" -"Scheda SD [normale]" +"Mem. SD [normale]" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" -"Scheda SD[FlashAir]" +"Mem. SD[FlashAir]" #MSG_SD_CARD_OK c=0 r=0 "SD card ok" -"Scheda SD OK" +"Memoria SD ok" #MSG_SD_INIT_FAIL c=0 r=0 "SD init fail" -"Inizializzazione SD fallita" +"Inizializzazione Memoria SD Fallita" #MSG_SD_PRINTING_BYTE c=0 r=0 "SD printing byte " -"Byte stampa SD" +"SD stampa byte " #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 "Searching bed calibration point" -"Ricerca dei punti di calibrazione del letto di stampa." +"Ricerca dei punti di calibrazione del piano" #MSG_LANGUAGE_SELECT c=0 r=0 "Select language" @@ -892,7 +952,7 @@ #MSG_SELFTEST_START c=20 r=0 "Self test start " -"Avvia autotest" +"Avvia autotest " #MSG_SELFTEST c=0 r=0 "Selftest " @@ -904,15 +964,15 @@ #MSG_SELFTEST_FAILED c=20 r=0 "Selftest failed " -"Autotest fallito" +"Autotest fallito " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." -"Verra' effettuato un Autotest per un riposizionamento sensorless accurato." +"Verra effettuato un self test per calibrare l'homing senza sensori." #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" -"Imposta temperat. :" +"Imposta temperatura:" #MSG_SETTINGS c=0 r=0 "Settings" @@ -920,7 +980,7 @@ #MSG_SHOW_END_STOPS c=17 r=1 "Show end stops" -"Mostra stato finecorsa" +"Stato finecorsa" #MSG_DWELL c=0 r=0 "Sleep..." @@ -928,27 +988,43 @@ #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." -"Alcuni file non saranno ordinati. Numero massimo file da ordinare: 100." +"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 -"Sort: [None]" +"Sort: [none]" "Ordine: [Nessuno]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" -"Ordine: [Tempo]" +"Sort: [time]" +"Ordine: [Tempo]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" -"Ordine: [Nome]" +"Sort: [alphabet]" +"Ordine:[Alfabet.]" #MSG_SORTING c=20 r=1 "Sorting files" "Ordinando i file" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Suono [forte]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Suono [mute]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Suono [singolo]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Suono[silenzioso]" + #MSG_SPEED c=0 r=0 "Speed" -"Velocita'" +"Velocita" #MSG_SELFTEST_FAN_YES c=19 r=0 "Spinning" @@ -956,15 +1032,15 @@ #MSG_TEMP_CAL_WARNING c=20 r=4 "Stable ambient temperature 21-26C is needed a rigid stand is required." -"Sono necessari una temp. amb. cost. di 21-26C e un appoggio ben saldo." +"Sono necessari una temperatura ambiente di 21-26C e una superficie rigida." #MSG_STATISTICS c=0 r=0 "Statistics " -"Statistiche" +"Statistiche " #MSG_STEPPER_TOO_HIGH c=0 r=0 "Steprate too high: " -"Velocita' passo troppo alta:" +"Velocita passo troppo alta: " #MSG_STOP_PRINT c=0 r=0 "Stop print" @@ -972,7 +1048,7 @@ #MSG_STOPPED c=0 r=0 "STOPPED. " -"ARRESTATO." +"ARRESTATO. " #MSG_SUPPORT c=0 r=0 "Support" @@ -984,7 +1060,7 @@ #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " -"Calib. temperatura " +"Calib. temp. " #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" @@ -992,11 +1068,11 @@ #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" -"Calib. temp." +"Calib. Temp." #MSG_TEMP_CAL_FAILED c=20 r=8 "Temperature calibration failed" @@ -1004,17 +1080,20 @@ #MSG_TEMP_CALIBRATION_DONE c=20 r=12 "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." -"Calib. temperatura completata e attiva. E' possibile disattivarla dal menu Impostazioni->Calib. temperatura" - +"Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." #MSG_TEMPERATURE c=0 r=0 "Temperature" -"Temperatura" +"\x00" #MSG_MENU_TEMPERATURES c=15 r=1 "Temperatures" "Temperature" +#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." +"E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "ATTIVATO" @@ -1025,7 +1104,7 @@ #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" -"Scarica filamento" +"Scarica filam." #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" @@ -1033,7 +1112,7 @@ #MSG_USED c=19 r=1 "Used during print" -"Usato nella stampa" +"Usati nella stampa" #MSG_MENU_VOLTAGES c=15 r=1 "Voltages" @@ -1041,31 +1120,31 @@ #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" -"\x00" +"volume.init fallito" #MSG_USERWAIT c=0 r=0 "Wait for user..." -"In attesa di utente." +"Attendendo utente..." #MSG_WAITING_TEMP c=20 r=3 "Waiting for nozzle and bed cooling" -"In attesa che ugello e letto di stampa si raffreddino." +"In attesa del raffreddamento dell'ugello e del piano" #MSG_WAITING_TEMP_PINDA c=20 r=3 "Waiting for PINDA probe cooling" -"In attesa che la sonda PINDA si raffreddi." +"In attesa del raffreddamento della sonda PINDA" #MSG_CHANGED_BOTH c=20 r=4 "Warning: both printer type and motherboard type changed." -"Attenzione: tipo di stampante e scheda madre cambiati." +"Attenzione: tipo di stampante e di scheda madre cambiati." #MSG_CHANGED_MOTHERBOARD c=20 r=4 "Warning: motherboard type changed." -"Attenzione: tipo di scheda madre cambiato." +"Avviso: tipo di scheda madre cambiato." #MSG_CHANGED_PRINTER c=20 r=4 "Warning: printer type changed." -"Attenzione: tipo di stampante cambiato." +"Avviso: tipo di stampante cambiato." #MSG_UNLOAD_SUCCESSFUL c=20 r=2 "Was filament unload successful?" @@ -1077,11 +1156,11 @@ #MSG_WIZARD c=17 r=1 "Wizard" -"Wizard" +"\x00" #MSG_SD_WORKDIR_FAIL c=0 r=0 "workDir open failed" -"\x00" +"workDir open fallito" #MSG_SD_WRITE_TO_FILE c=0 r=0 "Writing to file: " @@ -1089,11 +1168,11 @@ #MSG_XYZ_DETAILS c=19 r=1 "XYZ cal. details" -"Calib. XYZ dettagli" +"XYZ Cal. dettagli" #MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 "XYZ calibration failed. Please consult the manual." -"Calibrazione XYZ fallita. Consultare il manuale prego." +"Calibrazione XYZ fallita. Si prega di consultare il manuale." #MSG_YES c=0 r=0 "Yes" @@ -1101,4 +1180,4 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." -"Si puo' riprendere il Wizard in qualsiasi momento dal menu Calibrazione->Wizard." +"E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 0576c47a..29e2420c 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,6 +1,6 @@ #MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 " [off" -"[wyl" +" [wyl" #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " @@ -12,7 +12,7 @@ #MSG_FREE_MEMORY c=0 r=0 " Free Memory: " -" Wolna pamiec:" +" Wolna pamiec: " #MSG_CONFIGURATION_VER c=0 r=0 " Last Updated: " @@ -32,11 +32,11 @@ #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 "\x1b[2JCrash detection can\x1b[1;0Hbe turned on only in\x1b[2;0HNormal mode" -"\x00" +"\x1b[2JWykrywanie zderzen moze\x1b[1;0Hbyc wlaczone tylko w\x1b[2;0Htrybie Normalnym" #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 "\x1b[2JWARNING:\x1b[1;0HCrash detection\x1b[2;0Hdisabled in\x1b[3;0HStealth mode" -"\x00" +"\x1b[2JUWAGA:\x1b[1;0HWykrywanie zderzen\x1b[2;0Hwylaczone w\x1b[3;0Htrybie Stealth" #MSG_REFRESH c=0 r=0 "\xf8Refresh" @@ -66,6 +66,14 @@ "Auto adjust Z?" "Autodostroic Z?" +#MSG_AUTO_DEPLETE_ON c=17 r=1 +"Auto deplete [on]" +"Wyk. resztek [wl]" + +# MSG_AUTO_DEPLETE_OFF c=17 r=1 +"Auto deplete[off]" +"Wyk. resztek[wyl]" + #MSG_AUTO_HOME c=0 r=0 "Auto home" "Auto zerowanie" @@ -100,7 +108,7 @@ #MSG_BED_HEATING c=0 r=0 "Bed Heating" -"Grzanie stolu.." +"Grzanie stolu" #MSG_BED_CORRECTION_MENU c=0 r=0 "Bed level correct" @@ -180,7 +188,7 @@ #MSG_NOT_COLOR c=0 r=0 "Color not correct" -"Kolor zanieczysz." +"Kolor zanieczysz" #MSG_COOLDOWN c=0 r=0 "Cooldown" @@ -188,19 +196,19 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Wykr. zderzen [wl]" +"Wykr. zderzen[wl]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Wykr. zderzen [n/d]" +"Wykr.zderzen[n/d]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Wykr. zderzen [wyl]" +"Wykr.zderzen[wyl]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." -"Zderzenie wykryte" +"Zderzenie wykryte." #MSG_CURRENT c=19 r=1 "Current" @@ -226,13 +234,25 @@ "E-correct" "Korekcja E" +#MSG_EJECT_FILAMENT c=17 r=1 +"Eject filament" +"Wysun filament" + +#MSG_EJECT_FILAMENT1 c=17 r=1 +"Eject filament 1" +"Wysun filament 1" + +#MSG_EJECTING_FILAMENT c=20 r=1 +"Ejecting filament" +"Wysuwanie filamentu" + #MSG_END_FILE_LIST c=0 r=0 "End file list" "Koniec listy plikow" #MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 "Endstop not hit" -"Krancowka nie aktyw." +"Krancowka nie aktyw" #MSG_SELFTEST_ENDSTOP c=0 r=0 "Endstop" @@ -240,7 +260,7 @@ #MSG_ENDSTOPS_HIT c=0 r=0 "endstops hit: " -"krancowki aktywowane:" +"krancowki aktywowane: " #MSG_SELFTEST_ENDSTOPS c=0 r=0 "Endstops" @@ -280,15 +300,15 @@ #MSG_FSENS_AUTOLOAD_ON c=17 r=1 "F. autoload [on]" -"Autoladowanie fil. [wl]" +"Autolad.fil. [wl]" #MSG_FSENS_AUTOLOAD_NA c=17 r=1 "F. autoload [N/A]" -"Autoladowanie fil. [N/D]" +"Autolad.fil.[N/D]" #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" -"Autoladowanie [wyl]" +"Autoladowanie[wl]" #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -300,23 +320,27 @@ #MSG_FANS_CHECK_ON c=17 r=1 "Fans check [on]" -"Sprawdzanie wentylatorow [wl]" +"Sprawd.went. [wl]" #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -"Sprawdzanie wentylatorow [wyl]" +"Sprawd.went.[wyl]" #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Czuj. filamentu. [wl]" +"Czuj. filam. [wl]" + +#MSG_RESPONSE_POOR c=20 r=2 +"Fil. sensor response is poor, disable it?" +"Reakcja czujnika slaba, wylaczyc?" #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" -"Czuj. filamentu [N/D]" +"Czuj. fil. [N/D]" #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" -"Czuj. fil. [wyl]" +"Czuj. fil. [wyl]" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -334,13 +358,17 @@ "Filament sensor:" "Czujnik filamentu:" +#MSG_FILAMENT_USED c=19 r=1 +"Filament used" +"Uzyty filament" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Plik niekompletny. Kontynowac?" #MSG_SD_FILE_OPENED c=0 r=0 "File opened: " -"Otwarty plik:" +"Otwarty plik: " #MSG_SD_FILE_SELECTED c=0 r=0 "File selected" @@ -352,7 +380,7 @@ #MSG_V2_CALIBRATION c=17 r=1 "First layer cal." -"Kal. 1. warstwy" +"Kal. 1. warstwy." #MSG_WIZARD_SELFTEST c=20 r=8 "First, I will run the selftest to check most common assembly problems." @@ -384,15 +412,15 @@ #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." -"Grzanie wylaczone przez wyl. czasowy" +"Grzanie wylaczone przez wyl. czasowy." #MSG_HEATING_COMPLETE c=20 r=0 "Heating done." -"Grzanie zakonczone" +"Grzanie zakonczone." #MSG_HEATING c=0 r=0 "Heating" -"Grzanie..." +"Grzanie" #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?" @@ -420,7 +448,7 @@ #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"Kontrola stolu" +"Kontrola stolu " #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" @@ -428,27 +456,27 @@ #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " -"Kontrola hotendu" +"Kontrola hotendu " #MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 "Checking sensors " -"Sprawdzanie czujnikow" +"Sprawdzanie czujnikow " #MSG_SELFTEST_CHECK_X c=20 r=0 "Checking X axis " -"Kontrola osi X" +"Kontrola osi X " #MSG_SELFTEST_CHECK_Y c=20 r=0 "Checking Y axis " -"Kontrola osi Y" +"Kontrola osi Y " #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -"Kontrola osi Z" +"Kontrola osi Z " #MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 "checksum mismatch, Last Line: " -"suma kontrolna niezgodna, ostatnia linia:" +"suma kontrolna niezgodna, ostatnia linia: " #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" @@ -464,7 +492,7 @@ #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" +"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 r=0 "Improving bed calibration point" @@ -516,7 +544,7 @@ #MSG_KILLED c=0 r=0 "KILLED. " -"PRZERWANE." +"PRZERWANE. " #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 "Left hotend fan?" @@ -548,15 +576,15 @@ #MSG_M104_INVALID_EXTRUDER c=0 r=0 "M104 Invalid extruder " -"M104 Nieprawidlowy ekstruder" +"M104 Nieprawidlowy ekstruder " #MSG_M105_INVALID_EXTRUDER c=0 r=0 "M105 Invalid extruder " -"M105 Nieprawidlowy ekstruder" +"M105 Nieprawidlowy ekstruder " #MSG_M109_INVALID_EXTRUDER c=0 r=0 "M109 Invalid extruder " -"M109 Nieprawidlowy ekstruder" +"M109 Nieprawidlowy ekstruder " #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." @@ -564,15 +592,15 @@ #MSG_M200_INVALID_EXTRUDER c=0 r=0 "M200 Invalid extruder " -"M200 Nieprawidlowy ekstruder" +"M200 Nieprawidlowy ekstruder " #MSG_M218_INVALID_EXTRUDER c=0 r=0 "M218 Invalid extruder " -"M218 Nieprawidlowy ekstruder" +"M218 Nieprawidlowy ekstruder " #MSG_M221_INVALID_EXTRUDER c=0 r=0 "M221 Invalid extruder " -"M221 Nieprawidlowy ekstruder" +"M221 Nieprawidlowy ekstruder " #MSG_MAIN c=0 r=0 "Main" @@ -586,25 +614,41 @@ "Mesh Bed Leveling" "Poziomowanie stolu wg siatki" +#MSG_MMU_NEEDS_ATTENTION c=20 r=4 +"MMU needs user attention. Fix the issue and then press button on MMU unit." +"MMU wymaga uwagi. Napraw usterke i wcisnij przycisk na korpusie MMU." + +#MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +"MMU OK. Resuming position..." +"MMU OK. Wznawianie pozycji." + +#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +"MMU OK. Resuming temperature..." +"MMU OK. Wznawiam nagrzewanie..." + +#MSG_MMU_OK_RESUMING c=20 r=4 +"MMU OK. Resuming..." +"MMU OK. Wznawianie..." + #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Tryb [normalny]" +"Tryb [normalny]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Tryb [cichy]" +"Tryb [cichy]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Tryb [Stealth]" +"Tryb [Stealth]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" -"Tryb [automatyczny]" +"Tryb[automatycz.]" #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" -"Tryb [wysoka wydajnosc]" +"Tryb[wysok.wyda.]" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -628,7 +672,7 @@ #MSG_ERR_NO_CHECKSUM c=0 r=0 "No Checksum with line number, Last Line: " -"Brak sumy kontrolnej z numerem linii, ostatnia linia:" +"Brak sumy kontrolnej z numerem linii, ostatnia linia: " #MSG_NO_MOVE c=0 r=0 "No move." @@ -644,7 +688,7 @@ #MSG_SELFTEST_NOTCONNECTED c=0 r=0 "Not connected" -"Nie podlaczono " +"Nie podlaczono" #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" @@ -672,7 +716,7 @@ #MSG_SD_OPEN_FILE_FAIL c=0 r=0 "open failed, File: " -"niepowodzenie otwarcia, Plik:" +"niepowodzenie otwarcia, Plik: " #MSG_ENDSTOP_OPEN c=0 r=0 "open" @@ -680,7 +724,7 @@ #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" -"niepowodzenie openRoot " +"niepowodzenie openRoot" #MSG_PAUSE_PRINT c=0 r=0 "Pause print" @@ -688,7 +732,7 @@ #MSG_PID_RUNNING c=20 r=1 "PID cal. " -"Kalibracja PID" +"Kalibracja PID. " #MSG_PID_FINISHED c=20 r=1 "PID cal. finished" @@ -750,10 +794,22 @@ "Please pull out filament immediately" "Wyciagnij filament teraz" +#MSG_EJECT_REMOVE c=20 r=4 +"Please remove filament and then press the knob." +"Wyciagnij filament i wcisnij pokretlo." + #MSG_REMOVE_STEEL_SHEET c=20 r=4 "Please remove steel sheet from heatbed." "Prosze zdjac plyte stalowa z podgrzewanego stolu." +#MSG_RUN_XYZ c=20 r=4 +"Please run XYZ calibration first." +"Prosze najpierw uruchomic kalibracje XYZ." + +#MSG_UPDATE_MMU2_FW c=20 r=4 +"Please update firmware in your MMU2. Waiting for reset." +"Prosze zaktualizowac Firmware MMU2. Czekam na reset." + #MSG_PLEASE_WAIT c=20 r=0 "Please wait" "Prosze czekac" @@ -808,7 +864,7 @@ #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." -"Prusa i3 MK3 gotowa" +"Prusa i3 MK3 gotowa." #MSG_PRUSA3D c=0 r=0 "prusa3d.com" @@ -820,7 +876,11 @@ #MSG_RECOVERING_PRINT c=20 r=1 "Recovering print " -"Wznawianie wydruku" +"Wznawianie wydruku " + +#MSG_REMOVE_OLD_FILAMENT c=20 r=4 +"Remove old filament and press the knob to start loading new filament." +"Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." #MSG_M119_REPORT c=0 r=0 "Reporting endstop status" @@ -848,11 +908,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"Port RPi [wl]" +"Port RPi [wl]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"Port RPi [wyl]" +"Port RPi [wyl]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -860,11 +920,11 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" -"Karta SD [normalna]" +"Karta SD [normal]" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" -"Karta SD [FlashAir]" +"Karta SD[FlshAir]" #MSG_SD_CARD_OK c=0 r=0 "SD card ok" @@ -892,7 +952,7 @@ #MSG_SELFTEST_START c=20 r=0 "Self test start " -"Rozpoczynanie Selftestu" +"Rozpoczynanie Selftestu " #MSG_SELFTEST c=0 r=0 "Selftest " @@ -904,11 +964,11 @@ #MSG_SELFTEST_FAILED c=20 r=0 "Selftest failed " -"Selftest nieudany" +"Selftest nieudany " #MSG_FORCE_SELFTEST c=20 r=8 "Selftest will be run to calibrate accurate sensorless rehoming." -"Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" +"Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek." #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" @@ -931,21 +991,37 @@ "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [None]" +"Sort: [none]" "Sortowanie:[brak]" #MSG_SORT_TIME c=17 r=1 -"Sort: [Time]" +"Sort: [time]" "Sortowanie:[czas]" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [Alphabet]" -"Sort.:[alfabet]" +"Sort: [alphabet]" +"Sort.: [alfabet]" #MSG_SORTING c=20 r=1 "Sorting files" "Sortowanie plikow" +#MSG_SOUND_LOUD c=17 r=1 +"Sound [loud]" +"Dzwiek [Glosny]" + +#MSG_SOUND_MUTE c=17 r=1 +"Sound [mute]" +"Dzwiek[Wylaczony]" + +#MSG_SOUND_ONCE c=17 r=1 +"Sound [once]" +"Dzwiek [1-raz]" + +#MSG_SOUND_SILENT c=17 r=1 +"Sound [silent]" +"Dzwiek [Cichy]" + #MSG_SPEED c=0 r=0 "Speed" "Predkosc" @@ -960,11 +1036,11 @@ #MSG_STATISTICS c=0 r=0 "Statistics " -"Statystyki" +"Statystyki " #MSG_STEPPER_TOO_HIGH c=0 r=0 "Steprate too high: " -"Liczba krokow zbyt wysoka:" +"Liczba krokow zbyt wysoka: " #MSG_STOP_PRINT c=0 r=0 "Stop print" @@ -972,7 +1048,7 @@ #MSG_STOPPED c=0 r=0 "STOPPED. " -"ZATRZYMANO." +"ZATRZYMANO. " #MSG_SUPPORT c=0 r=0 "Support" @@ -984,19 +1060,19 @@ #MSG_TEMP_CALIBRATION c=20 r=1 "Temp. cal. " -"Kalibracja temp." +"Kalibracja temp. " #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]" -"Kalibr. temp. [wyl]" +"Kalibr.temp.[wyl]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" -"Kalibracja temp." +"Kalibracja temp" #MSG_TEMP_CAL_FAILED c=20 r=8 "Temperature calibration failed" @@ -1014,6 +1090,10 @@ "Temperatures" "Temperatury" +#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." +"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "AKTYWOWANO" @@ -1040,7 +1120,7 @@ #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" -"niepowodzenie volume.init " +"niepowodzenie volume.init" #MSG_USERWAIT c=0 r=0 "Wait for user..." @@ -1064,7 +1144,7 @@ #MSG_CHANGED_PRINTER c=20 r=4 "Warning: printer type changed." -"Ostrzezenie: rodzaj drukarki ulegl zmianie" +"Ostrzezenie: rodzaj drukarki ulegl zmianie." #MSG_UNLOAD_SUCCESSFUL c=20 r=2 "Was filament unload successful?" @@ -1084,7 +1164,7 @@ #MSG_SD_WRITE_TO_FILE c=0 r=0 "Writing to file: " -"Zapis do pliku:" +"Zapis do pliku: " #MSG_XYZ_DETAILS c=19 r=1 "XYZ cal. details" diff --git a/lang/make_lang.sh b/lang/make_lang.sh index 2a3b16e3..88551f8f 100644 --- a/lang/make_lang.sh +++ b/lang/make_lang.sh @@ -16,7 +16,7 @@ # # Selected language: LNG=$1 -if [ -z "$LNG" ]; then LNG='cz'; fi +if [ -z "$LNG" ]; then LNG='all'; fi # # @@ -95,6 +95,7 @@ case "$LNG" in *cz*) lt_code='\x73\x63' ;; *de*) lt_code='\x65\x64' ;; *es*) lt_code='\x73\x65' ;; + *fr*) lt_code='\x71\x66' ;; *it*) lt_code='\x74\x69' ;; *pl*) lt_code='\x6c\x70' ;; esac @@ -161,6 +162,7 @@ if [ "$LNG" = "all" ]; then make_lang cz make_lang de make_lang es + make_lang fr make_lang it make_lang pl exit 0 diff --git a/lang/postbuild.sh b/lang/postbuild.sh index 0d5686b6..c8db1969 100644 --- a/lang/postbuild.sh +++ b/lang/postbuild.sh @@ -151,6 +151,11 @@ else ./update_lang.sh es 2>./update_lang_es.out 1>/dev/null if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi fi + if [ -e lang_fr.bin ]; then + echo -n " French : " >&2 + ./update_lang.sh fr 2>./update_lang_fr.out 1>/dev/null + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + fi if [ -e lang_pl.bin ]; then echo -n " Polish : " >&2 ./update_lang.sh pl 2>./update_lang_pl.out 1>/dev/null From c023fb12d58d5f6cb0ad7a11b5405377244e3879 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 09:50:50 +0200 Subject: [PATCH 05/25] add choose filament messages --- Firmware/messages.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/messages.c b/Firmware/messages.c index 35aa9068..52c23d36 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -32,6 +32,7 @@ const char MSG_Enqueing[] PROGMEM_I1 = ISTR("enqueing \""); ////c=0 r=0 const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 +const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 r=0 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2 const char MSG_FILAMENT_LOADING_T0[] PROGMEM_I1 = ISTR("Insert filament into extruder 1. Click when done."); ////c=20 r=4 @@ -51,6 +52,7 @@ const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=0 r=0 const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 r=0 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=0 r=0 const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 +const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////c=17 r=0 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 r=0 const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1 From b963d4bf798a99f2fa5c98a7cb6d525604f20134 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 10:47:31 +0200 Subject: [PATCH 06/25] translation of new messages --- lang/lang_en.txt | 6 ++++++ lang/lang_en_cz.txt | 6 ++++++ lang/lang_en_de.txt | 7 +++++++ lang/lang_en_es.txt | 8 ++++++++ lang/lang_en_fr.txt | 10 +++++++++- lang/lang_en_it.txt | 7 +++++++ lang/lang_en_pl.txt | 6 ++++++ 7 files changed, 49 insertions(+), 1 deletion(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 94c97273..b41e804d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -361,6 +361,12 @@ #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" + +#MSG_FILAMENT c=17 r=1 +"Filament" + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 2aa39a78..44bfc59d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -482,6 +482,12 @@ "Choose extruder:" "Vyberte extruder:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Vyberte filament:" + +#MSG_FILAMENT c=17 r=1 +"Filament" + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." "Nyni provedu xyz kalibraci. Zabere to priblizne 12 min." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index d8958717..3626264a 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -482,6 +482,13 @@ "Choose extruder:" "Extruder waehlen:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Filament waehlen:" + +#MSG_FILAMENT c=17 r=1 +"Filament" + + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." "Ich werde jetzt die XYZ-Kalibrierung durchfuehren. Es wird ca. 12 Minuten dauern." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f1a82141..858827a8 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -482,6 +482,14 @@ "Choose extruder:" "Elegir extrusor:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" +"Elegir filamento:" + +#MSG_FILAMENT c=17 r=1 +"Filament" +"Filamento" + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." "Hare la calibracion XYZ. Tardara 12 min. aproximadamente." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7efd3e56..416db012 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -480,7 +480,15 @@ #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" -"Choisir extrudeur :" +"Choisir extrudeur:" + +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" +"Choisir filament:" + +#MSG_FILAMENT c=17 r=1 +"Filament" +"Filament" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 02462669..84b19a10 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -482,6 +482,13 @@ "Choose extruder:" "Seleziona estrusore:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" +"Seleziona filamento:" + +#MSG_FILAMENT c=17 r=1 +"Filamento" + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." "Adesso avviero una Calibrazione XYZ. Puo durare circa 12 min." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 29e2420c..8de1c699 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -482,6 +482,12 @@ "Choose extruder:" "Wybierz ekstruder:" +#MSG_CHOOSE_FILAMENT c=20 r=1 +"Wybierz filament:" + +#MSG_FILAMENT c=17 r=1 +"Filament" + #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." "Przeprowadze teraz kalibracje XYZ. Zajmie ok. 12 min." From d6a7c3d06116c7c901f5431d18e7d0969d3409cc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 10:51:21 +0200 Subject: [PATCH 07/25] corrections --- lang/lang_en_cz.txt | 2 ++ lang/lang_en_de.txt | 3 ++- lang/lang_en_it.txt | 1 + lang/lang_en_pl.txt | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 44bfc59d..95a52bab 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -483,10 +483,12 @@ "Vyberte extruder:" #MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" "Vyberte filament:" #MSG_FILAMENT c=17 r=1 "Filament" +"Filament" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 3626264a..354daa49 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -483,11 +483,12 @@ "Extruder waehlen:" #MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" "Filament waehlen:" #MSG_FILAMENT c=17 r=1 "Filament" - +"Filament" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 84b19a10..c2bbeb72 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -487,6 +487,7 @@ "Seleziona filamento:" #MSG_FILAMENT c=17 r=1 +"Filament" "Filamento" #MSG_WIZARD_XYZ_CAL c=20 r=8 diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 8de1c699..ff6343a9 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -483,10 +483,12 @@ "Wybierz ekstruder:" #MSG_CHOOSE_FILAMENT c=20 r=1 +"Choose filament:" "Wybierz filament:" #MSG_FILAMENT c=17 r=1 "Filament" +"Filament" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." From d9a2fe70ecea0426847df50b042d7758a7aae3b2 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 11:06:37 +0200 Subject: [PATCH 08/25] missing declaration fix --- Firmware/messages.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/messages.h b/Firmware/messages.h index 07f2a3a7..dda38458 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -29,6 +29,7 @@ extern const char MSG_Enqueing[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; +extern const char MSG_FILAMENT[]; extern const char MSG_FAN_SPEED[]; extern const char MSG_FILAMENT_CLEAN[]; extern const char MSG_FILAMENT_LOADING_T0[]; @@ -48,6 +49,7 @@ extern const char MSG_HEATING[]; extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; extern const char MSG_CHOOSE_EXTRUDER[]; +extern const char MSG_CHOOSE_FILAMENT[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_FILAMENT[]; extern const char MSG_M117_V2_CALIBRATION[]; From 5c1a3f7fe8ed123fee00d8846ed8e904ec0a96af Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 13:15:52 +0200 Subject: [PATCH 09/25] eject filament translations --- lang/lang_en_cz.txt | 16 ++++++++++++++++ lang/lang_en_de.txt | 16 ++++++++++++++++ lang/lang_en_es.txt | 18 +++++++++++++++++- lang/lang_en_fr.txt | 18 +++++++++++++++++- lang/lang_en_it.txt | 16 ++++++++++++++++ lang/lang_en_pl.txt | 16 ++++++++++++++++ 6 files changed, 98 insertions(+), 2 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 95a52bab..f7244ee9 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -242,6 +242,22 @@ "Eject filament 1" "Vysunout filament 1" +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Vysunout filament 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Vysunout filament 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Vysunout filament 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Vysunout filament 5" + #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Vysouvam filament" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 354daa49..2598b3c3 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -242,6 +242,22 @@ "Eject filament 1" "Filamentauswurf 1" +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Filamentauswurf 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Filamentauswurf 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Filamentauswurf 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Filamentauswurf 5" + #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Werfe Filament aus" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 858827a8..ddc4f761 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -240,7 +240,23 @@ #MSG_EJECT_FILAMENT1 c=17 r=1 "Eject filament 1" -"Expulsar filamento 1" +"Expulsar filam. 1" + +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Expulsar filam. 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Expulsar filam. 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Expulsar filam. 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Expulsar filam. 5" #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 416db012..7867f97a 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -240,7 +240,23 @@ #MSG_EJECT_FILAMENT1 c=17 r=1 "Eject filament 1" -"Ejecter le filament 1" +"Ejecter le fil. 1" + +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Ejecter le fil. 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Ejecter le fil. 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Ejecter le fil. 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Ejecter le fil. 5" #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c2bbeb72..1a8a7d14 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -242,6 +242,22 @@ "Eject filament 1" "Espelli filamento 1" +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Espelli filamento 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Espelli filamento 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Espelli filamento 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Espelli filamento 5" + #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Espellendo filamento" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index ff6343a9..901ab9cc 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -242,6 +242,22 @@ "Eject filament 1" "Wysun filament 1" +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" +"Wysun filament 1" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" +"Wysun filament 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" +"Wysun filament 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" +"Wysun filament 5" + #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" "Wysuwanie filamentu" From f7baee1f56486edb51ee79ddfd1cf9817a0da01c Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 14:21:15 +0200 Subject: [PATCH 10/25] lang_en update --- lang/lang_en.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index b41e804d..4d2febe2 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -181,6 +181,18 @@ #MSG_EJECT_FILAMENT1 c=17 r=1 "Eject filament 1" +#MSG_EJECT_FILAMENT2 c=17 r=1 +"Eject filament 2" + +#MSG_EJECT_FILAMENT3 c=17 r=1 +"Eject filament 3" + +#MSG_EJECT_FILAMENT4 c=17 r=1 +"Eject filament 4" + +#MSG_EJECT_FILAMENT5 c=17 r=1 +"Eject filament 5" + #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" From b45eb05970a49db9557fb83e9f3938e9ac0b5333 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 16:31:42 +0200 Subject: [PATCH 11/25] xyz cal. messages --- lang/lang_en.txt | 17 +++++++++++++++++ lang/lang_en_cz.txt | 24 ++++++++++++++++++++++++ lang/lang_en_de.txt | 24 ++++++++++++++++++++++++ lang/lang_en_es.txt | 24 ++++++++++++++++++++++++ lang/lang_en_it.txt | 24 ++++++++++++++++++++++++ lang/lang_en_pl.txt | 24 ++++++++++++++++++++++++ 6 files changed, 137 insertions(+) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 4d2febe2..39ec7b4a 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -904,3 +904,20 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index f7244ee9..6b99e836 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1205,3 +1205,27 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." "\x00" + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." +"Kalibrace XYZ v poradku. Zkoseni bude automaticky vyrovnano pri tisku." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" +"Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" +"Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." +"Kalibrace XYZ nepresna. Predni kalibracni body moc vpredu." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." +"Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." +"Kalibrace XYZ nepresna. Levy predni bod moc vpredu." \ No newline at end of file diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 2598b3c3..237a9548 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1205,3 +1205,27 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." "Sie koennen den Assistenten immer im Menu neu starten: Kalibrierung -> Assistent" + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." +"XYZ Kalibrierung in Ordnung. Schiefheit wird automatisch korrigiert." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" +"XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schief." + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" +"XYZ-Kalibrierung OK. X/Y-Achsen sind senkrecht zueinander. Glueckwunsch!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." +"XYZ-Kalibrierung ungenau. Vordere Kalibrierpunkte sind zu weit vorne." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." +"XYZ-Kalibrierung ungenau. Rechter vorderer Kalibrierpunkt ist zu weit vorne." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." +"XYZ-Kalibrierung ungenau. Linker vorderer Kalibrierpunkt ist zu weit vorne." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ddc4f761..19bc0158 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1205,3 +1205,27 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." "Siempre puedes acceder al asistente desde Calibracion -> Wizard." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." +"Calibracion XYZ correcta. La inclinacion se corregira automaticamente." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" +"Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" +"Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." +"Calibrazion XYZ comprometida. Puntos frontales no alcanzables." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." +"Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." +"Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1a8a7d14..1de2ad4d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1205,3 +1205,27 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." "E possibile riprendere il Wizard in qualsiasi momento attraverso Calibrazione -> Wizard." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." +"Calibrazion XYZ corretta. La distorsione verra' automaticamente compensata." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" +"Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" +"Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." +"Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." +"Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." +"Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." \ No newline at end of file diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 901ab9cc..38fdd030 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1206,3 +1206,27 @@ "You can always resume the Wizard from Calibration -> Wizard." "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +"XYZ calibration all right. Skew will be corrected automatically." +"Kalibracja XYZ prawidlowa. Skosy beda automatycznie wyrownane przy druku." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" +"Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" +"Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." +"Kalibr. XYZ niedokladna. Przednie punkty kalibr. Zbyt wys. do przodu." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." +"Kalibracja XYZ niedokladna. Prawy przedni punkt zbyt wysuniety do przodu." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." +"Kalibracja XYZ niedokladna. Lewy przedni punkt zbyt wysuniety do przodu." + From 3395213dd1ed2b6dcde524c8f307a770791b644d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 16:33:33 +0200 Subject: [PATCH 12/25] french language xyz cal. messages --- lang/lang_en_fr.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7867f97a..1d8ac1bd 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1206,3 +1206,20 @@ "You can always resume the Wizard from Calibration -> Wizard." "Vous pouvez toujours poursuivre 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." + +#MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 +"XYZ calibration all right. X/Y axes are slightly skewed. Good job!" + +#MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +"XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 +"XYZ calibration compromised. Front calibration points not reachable." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +"XYZ calibration compromised. Right front calibration point not reachable." + +#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 +"XYZ calibration compromised. Left front calibration point not reachable." From bb7110febd90c3d0e55f4fbd25ac50396dc59e90 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 16:47:58 +0200 Subject: [PATCH 13/25] some messages in czech language fixed --- 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 6b99e836..fff485de 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -344,7 +344,7 @@ #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"\x00" +"Fil. sensor [zap]" #MSG_RESPONSE_POOR c=20 r=2 "Fil. sensor response is poor, disable it?" @@ -716,7 +716,7 @@ #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" -"\x00" +"Netoci se" #MSG_WIZARD_V2_CAL c=20 r=8 "Now I will calibrate distance between tip of the nozzle and heatbed surface." @@ -1204,7 +1204,7 @@ #MSG_WIZARD_QUIT c=20 r=8 "You can always resume the Wizard from Calibration -> Wizard." -"\x00" +"Wizarda muzete kdykoliv znovu spustit z menu Calibration -> Wizard" #MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 "XYZ calibration all right. Skew will be corrected automatically." From 96aada90614b9fdd2c492dac59e1543931f5b501 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 18:25:38 +0200 Subject: [PATCH 14/25] load filament messages, czech language missing translation readded --- Firmware/ultralcd.cpp | 6 +++--- lang/lang_en.txt | 18 ++++++++++++++++++ lang/lang_en_cz.txt | 30 +++++++++++++++++++++++++++--- lang/lang_en_de.txt | 24 ++++++++++++++++++++++++ lang/lang_en_es.txt | 24 ++++++++++++++++++++++++ lang/lang_en_fr.txt | 6 ++++++ lang/lang_en_it.txt | 26 +++++++++++++++++++++++++- lang/lang_en_pl.txt | 25 +++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 26736c95..b78b4c97 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5203,7 +5203,7 @@ static void fil_load_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 r=0 @@ -5232,14 +5232,14 @@ static void fil_unload_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Unload all"), extr_unload_all);////MSG_UNLOAD_ALL c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Unload all"), extr_unload_all);////MSG_UNLOAD_ALL c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Unload filament 1"), extr_unload_0);////MSG_UNLOAD_FILAMENT_1 c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Unload filament 2"), extr_unload_1);////MSG_UNLOAD_FILAMENT_2 c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Unload filament 3"), extr_unload_2);////MSG_UNLOAD_FILAMENT_3 c=17 r=0 MENU_ITEM_FUNCTION_P(_i("Unload filament 4"), extr_unload_3);////MSG_UNLOAD_FILAMENT_4 c=17 r=0 if (mmu_enabled) - MENU_ITEM_FUNCTION_P(_i("Unload filament 5"), extr_unload_4);////MSG_UNLOAD_FILAMENT_4 c=17 r=0 + MENU_ITEM_FUNCTION_P(_i("Unload filament 5"), extr_unload_4);////MSG_UNLOAD_FILAMENT_5 c=17 r=0 MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 39ec7b4a..d11024d0 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -921,3 +921,21 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." + +#MSG_LOAD_ALL c=17 r=0 +"Load all" + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" \ No newline at end of file diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index fff485de..47033dde 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -360,7 +360,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"\x00" +"Je barva cista?" #MSG_NOT_LOADED c=19 r=0 "Filament not loaded" @@ -376,7 +376,7 @@ #MSG_FILAMENT_USED c=19 r=1 "Filament used" -"Spotrebovano filamentu" +"Spotrebovano fil." #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -1228,4 +1228,28 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." -"Kalibrace XYZ nepresna. Levy predni bod moc vpredu." \ No newline at end of file +"Kalibrace XYZ nepresna. Levy predni bod moc vpredu." + +#MSG_LOAD_ALL c=17 r=0 +"Load all" +"Zavest vse" + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" +"Zavest filament 1" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" +"Zavest filament 2" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" +"Zavest filament 3" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" +"Zavest filament 4" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" +"Zavest filament 5" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 237a9548..848123f2 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1229,3 +1229,27 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." "XYZ-Kalibrierung ungenau. Linker vorderer Kalibrierpunkt ist zu weit vorne." + +#MSG_LOAD_ALL c=17 r=0 +"Load all" +"Alle laden" + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" +"Filament 1 laden" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" +"Filament 2 laden" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" +"Filament 3 laden" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" +"Filament 4 laden" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" +"Filament 5 laden" \ No newline at end of file diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 19bc0158..c190a2bb 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1229,3 +1229,27 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." "Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." + +#MSG_LOAD_ALL c=17 r=0 +"Load all" +"Intr. todos fil." + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" +"Introducir fil. 1" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" +"Introducir fil. 2" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" +"Introducir fil. 3" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" +"Introducir fil. 4" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" +"Introducir fil. 5" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 1d8ac1bd..6b06ce0a 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1223,3 +1223,9 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." + +#MSG_UNLOAD_ALL c=17 r=0 +"Unload all" + +#MSG_UNLOAD_FILAMENT_1 c=17 r=0 +"Unload filament 1" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1de2ad4d..29b7dcd1 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1228,4 +1228,28 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 "XYZ calibration compromised. Left front calibration point not reachable." -"Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." \ No newline at end of file +"Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." + +#MSG_LOAD_ALL c=17 r=0 +"Load all" +"Caricare tutti" + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" +"Caricare fil. 1" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" +"Caricare fil. 2" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" +"Caricare fil. 3" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" +"Caricare fil. 4" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" +"Caricare fil. 5" \ No newline at end of file diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 38fdd030..930b71bd 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1230,3 +1230,28 @@ "XYZ calibration compromised. Left front calibration point not reachable." "Kalibracja XYZ niedokladna. Lewy przedni punkt zbyt wysuniety do przodu." +#MSG_LOAD_ALL c=17 r=0 +"Load all" +"Zalad. wszystkie" + +#MSG_LOAD_FILAMENT_1 c=17 r=0 +"Load filament 1" +"Zaladowac fil. 1" + +#MSG_LOAD_FILAMENT_2 c=17 r=0 +"Load filament 2" +"Zaladowac fil. 2" + +#MSG_LOAD_FILAMENT_3 c=17 r=0 +"Load filament 3" +"Zaladowac fil. 3" + +#MSG_LOAD_FILAMENT_4 c=17 r=0 +"Load filament 4" +"Zaladowac fil. 4" + +#MSG_LOAD_FILAMENT_5 c=17 r=0 +"Load filament 5" +"Zaladowac fil. 5" + + From 60a370eaafb765a645a55b82c81cb7d22c812e9e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 18:41:48 +0200 Subject: [PATCH 15/25] print time --- lang/lang_en.txt | 3 +++ lang/lang_en_cz.txt | 4 ++++ lang/lang_en_de.txt | 4 ++++ lang/lang_en_es.txt | 4 ++++ lang/lang_en_it.txt | 4 ++++ lang/lang_en_pl.txt | 4 ++++ 6 files changed, 23 insertions(+) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d11024d0..887c97b1 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -283,6 +283,9 @@ #MSG_FILAMENT_USED c=19 r=1 "Filament used" +#MSG_PRINT_TIME c=19 r=1 +"Filament used" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 47033dde..6100fe94 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -378,6 +378,10 @@ "Filament used" "Spotrebovano fil." +#MSG_PRINT_TIME c=19 r=1 +"Print time" +"Cas tisku" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Soubor nekompletni. Pokracovat?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 848123f2..ef21ac2c 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -378,6 +378,10 @@ "Filament used" "Filament benutzt" +#MSG_PRINT_TIME c=19 r=1 +"Print time" +"Druckzeit" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Datei unvollstaendig Trotzdem fortfahren?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index c190a2bb..02aff463 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -378,6 +378,10 @@ "Filament used" "Filamento usado" +#MSG_PRINT_TIME c=19 r=1 +"Print time" +"Tiempo de imp." + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Archivo incompleto. Continuar de todos modos?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 29b7dcd1..c4c7e1f0 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -378,6 +378,10 @@ "Filament used" "Filamento utilizzato" +#MSG_PRINT_TIME c=19 r=1 +"Print time" +"Tempo di stampa" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "File incompleto. Continuare comunque?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 930b71bd..3db25a48 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -378,6 +378,10 @@ "Filament used" "Uzyty filament" +#MSG_PRINT_TIME c=19 r=1 +"Print time" +"Czas druku" + #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" "Plik niekompletny. Kontynowac?" From d0829a0e9c92a4f263ec220eae503f2b9ee8506d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 19:04:37 +0200 Subject: [PATCH 16/25] msg off --- lang/lang_en.txt | 7 +++++-- lang/lang_en_cz.txt | 4 ++++ lang/lang_en_de.txt | 6 +++++- lang/lang_en_es.txt | 4 ++++ lang/lang_en_it.txt | 6 +++++- lang/lang_en_pl.txt | 4 +++- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 887c97b1..c78b09eb 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -284,7 +284,7 @@ "Filament used" #MSG_PRINT_TIME c=19 r=1 -"Filament used" +"Print time" #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -941,4 +941,7 @@ "Load filament 4" #MSG_LOAD_FILAMENT_5 c=17 r=0 -"Load filament 5" \ No newline at end of file +"Load filament 5" + +#MSG_OFF c=0 r=0 +" [off]" \ No newline at end of file diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 6100fe94..d318827c 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1257,3 +1257,7 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" "Zavest filament 5" + +#MSG_OFF c=0 r=0 +" [off]" +" [vyp]" \ No newline at end of file diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index ef21ac2c..f95c49b0 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1256,4 +1256,8 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" -"Filament 5 laden" \ No newline at end of file +"Filament 5 laden" + +#MSG_OFF c=0 r=0 +" [off]" +" [AUS]" \ No newline at end of file diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 02aff463..d776893f 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1257,3 +1257,7 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" "Introducir fil. 5" + +#MSG_OFF c=0 r=0 +" [off]" +" [OFF]" \ No newline at end of file diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c4c7e1f0..e279452c 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1256,4 +1256,8 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" -"Caricare fil. 5" \ No newline at end of file +"Caricare fil. 5" + +#MSG_OFF c=0 r=0 +" [off]" +" [OFF]" \ No newline at end of file diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 3db25a48..bb248403 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1258,4 +1258,6 @@ "Load filament 5" "Zaladowac fil. 5" - +#MSG_OFF c=0 r=0 +" [off]" +" [wyl]" \ No newline at end of file From 55542e9389e7680338418a8beef3576810eb0d51 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 19:36:44 +0200 Subject: [PATCH 17/25] cz language missing strings --- lang/lang_en_cz.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index d318827c..b49488db 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -428,7 +428,7 @@ #MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 "Heater/Thermistor" -"\x00" +"Heater/Termistor" #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." @@ -468,11 +468,11 @@ #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"\x00" +"Kontruji bed" #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" -"\x00" +"Kontroluji endstopy" #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " @@ -564,7 +564,7 @@ #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -"\x00" +"Je tiskovy plat na heatbed?" #MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 "Iteration " From 594908adc2effba70e1be8c8b25c78fe9609d447 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 11 Sep 2018 20:47:11 +0200 Subject: [PATCH 18/25] Lang update --- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 82 ++++++++++++++++++++++----------------------- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c78b09eb..e5c6ebd2 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -944,4 +944,4 @@ "Load filament 5" #MSG_OFF c=0 r=0 -" [off]" \ No newline at end of file +" [off]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b49488db..7bca1d38 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -4,7 +4,7 @@ #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " -"\x00" +" PlannerBufferBytes: " #MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 " cold extrusion prevented" @@ -196,15 +196,15 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Crash det. [zap]" +"Crash det. [zap]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"\x00" +"Crash det. [N/A]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Crash det. [vyp]" +"Crash det. [vyp]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -212,7 +212,7 @@ #MSG_CURRENT c=19 r=1 "Current" -"\x00" +"Pouze aktualni" #MSG_DATE c=17 r=1 "Date:" @@ -244,19 +244,19 @@ #MSG_EJECT_FILAMENT2 c=17 r=1 "Eject filament 2" -"Vysunout filament 2" +"\x00" #MSG_EJECT_FILAMENT3 c=17 r=1 "Eject filament 3" -"Vysunout filament 3" +"\x00" #MSG_EJECT_FILAMENT4 c=17 r=1 "Eject filament 4" -"Vysunout filament 4" +"\x00" #MSG_EJECT_FILAMENT5 c=17 r=1 "Eject filament 5" -"Vysunout filament 5" +"\x00" #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" @@ -344,7 +344,7 @@ #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -"Fil. sensor [zap]" +"Fil. senzor [zap]" #MSG_RESPONSE_POOR c=20 r=2 "Fil. sensor response is poor, disable it?" @@ -352,7 +352,7 @@ #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" -"\x00" +"Fil. senzor [N/A]" #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" @@ -360,7 +360,7 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -"Je barva cista?" +"Filament vytlacen a spravne barvy?" #MSG_NOT_LOADED c=19 r=0 "Filament not loaded" @@ -376,11 +376,11 @@ #MSG_FILAMENT_USED c=19 r=1 "Filament used" -"Spotrebovano fil." +"Spotrebovano filamentu" #MSG_PRINT_TIME c=19 r=1 "Print time" -"Cas tisku" +"\x00" #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -420,7 +420,7 @@ #MSG_BED_CORRECTION_FRONT c=14 r=1 "Front side[um]" -"Vpredu [um]" +"Vpredu [um]" #MSG_SELFTEST_FANS c=0 r=0 "Front/left fans" @@ -428,7 +428,7 @@ #MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 "Heater/Thermistor" -"Heater/Termistor" +"\x00" #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." @@ -468,11 +468,11 @@ #MSG_SELFTEST_CHECK_BED c=20 r=0 "Checking bed " -"Kontruji bed" +"Kontrola bed " #MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 "Checking endstops" -"Kontroluji endstopy" +"Kontrola endstops" #MSG_SELFTEST_CHECK_HOTEND c=20 r=0 "Checking hotend " @@ -484,15 +484,15 @@ #MSG_SELFTEST_CHECK_X c=20 r=0 "Checking X axis " -"\x00" +"Kontrola X axis " #MSG_SELFTEST_CHECK_Y c=20 r=0 "Checking Y axis " -"\x00" +"Kontrola Y axis " #MSG_SELFTEST_CHECK_Z c=20 r=0 "Checking Z axis " -"\x00" +"Kontrola Z axis " #MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 "checksum mismatch, Last Line: " @@ -504,11 +504,11 @@ #MSG_CHOOSE_FILAMENT c=20 r=1 "Choose filament:" -"Vyberte filament:" +"\x00" #MSG_FILAMENT c=17 r=1 "Filament" -"Filament" +"\x00" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." @@ -660,15 +660,15 @@ #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Mod [Normal]" +"Mod [Normal]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Mod [tichy]" +"Mod [tichy]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Mod [Stealth]" +"Mod [Stealth]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" @@ -676,7 +676,7 @@ #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" -"Mod [vys. vykon]" +"Mod [vys. vykon]" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -936,11 +936,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"RPi port [zap]" +"RPi port [zap]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"RPi port [vyp]" +"RPi port [vyp]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -948,7 +948,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" -"SD card [normal]" +"SD card [normal]" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" @@ -1020,11 +1020,11 @@ #MSG_SORT_NONE c=17 r=1 "Sort: [none]" -"Trideni [Zadne]" +"\x00" #MSG_SORT_TIME c=17 r=1 "Sort: [time]" -"Trideni [Cas]" +"\x00" #MSG_SORT_ALPHA c=17 r=1 "Sort: [alphabet]" @@ -1036,19 +1036,19 @@ #MSG_SOUND_LOUD c=17 r=1 "Sound [loud]" -"Zvuk [hlasity]" +"Zvuk [hlasity]" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" -"Zvuk [vypnuto]" +"Zvuk [vypnuto]" #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" -"Zvuk [jednou]" +"Zvuk [jednou]" #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -"Zvuk [tichy]" +"Zvuk [tichy]" #MSG_SPEED c=0 r=0 "Speed" @@ -1092,11 +1092,11 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Tepl. kal. [zap]" +"Tepl. kal. [zap]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Tepl. kal. [vyp]" +"Tepl. kal. [vyp]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" @@ -1160,7 +1160,7 @@ #MSG_WAITING_TEMP_PINDA c=20 r=3 "Waiting for PINDA probe cooling" -"\x00" +"Cekani na zchladnuti PINDA" #MSG_CHANGED_BOTH c=20 r=4 "Warning: both printer type and motherboard type changed." @@ -1256,8 +1256,8 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" -"Zavest filament 5" +"\x00" #MSG_OFF c=0 r=0 " [off]" -" [vyp]" \ No newline at end of file +"\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index f95c49b0..cb3979ed 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1260,4 +1260,4 @@ #MSG_OFF c=0 r=0 " [off]" -" [AUS]" \ No newline at end of file +" [AUS]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index d776893f..6937b597 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1260,4 +1260,4 @@ #MSG_OFF c=0 r=0 " [off]" -" [OFF]" \ No newline at end of file +" [OFF]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index e279452c..bf115700 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1260,4 +1260,4 @@ #MSG_OFF c=0 r=0 " [off]" -" [OFF]" \ No newline at end of file +" [OFF]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index bb248403..a6000744 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1260,4 +1260,4 @@ #MSG_OFF c=0 r=0 " [off]" -" [wyl]" \ No newline at end of file +" [wyl]" From 1b6035d075ccaff5006bdc2918ed8edb01ef72e7 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 11 Sep 2018 21:07:38 +0200 Subject: [PATCH 19/25] Lang update - cz fixed --- lang/lang_en_cz.txt | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7bca1d38..2d5c7cdf 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,6 +1,6 @@ #MSG_EXTRUDER_CORRECTION_OFF c=6 r=0 " [off" -"[vyp" +" [vyp" #MSG_PLANNER_BUFFER_BYTES c=0 r=0 " PlannerBufferBytes: " @@ -196,15 +196,15 @@ #MSG_CRASHDETECT_ON c=0 r=0 "Crash det. [on]" -"Crash det. [zap]" +"Crash det. [zap]" #MSG_CRASHDETECT_NA c=0 r=0 "Crash det. [N/A]" -"Crash det. [N/A]" +"Crash det. [N/A]" #MSG_CRASHDETECT_OFF c=0 r=0 "Crash det. [off]" -"Crash det. [vyp]" +"Crash det. [vyp]" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." @@ -244,19 +244,19 @@ #MSG_EJECT_FILAMENT2 c=17 r=1 "Eject filament 2" -"\x00" +"Vysunout filament 2" #MSG_EJECT_FILAMENT3 c=17 r=1 "Eject filament 3" -"\x00" +"Vysunout filament 3" #MSG_EJECT_FILAMENT4 c=17 r=1 "Eject filament 4" -"\x00" +"Vysunout filament 5" #MSG_EJECT_FILAMENT5 c=17 r=1 "Eject filament 5" -"\x00" +"Vysunout filament 5" #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" @@ -380,7 +380,7 @@ #MSG_PRINT_TIME c=19 r=1 "Print time" -"\x00" +"Cas tisku" #MSG_FILE_INCOMPLETE c=20 r=2 "File incomplete. Continue anyway?" @@ -428,7 +428,7 @@ #MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 "Heater/Thermistor" -"\x00" +"Heater/Termistor" #MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 "Heating disabled by safety timer." @@ -504,7 +504,7 @@ #MSG_CHOOSE_FILAMENT c=20 r=1 "Choose filament:" -"\x00" +"Vyberte filament:" #MSG_FILAMENT c=17 r=1 "Filament" @@ -660,15 +660,15 @@ #MSG_STEALTH_MODE_OFF c=0 r=0 "Mode [Normal]" -"Mod [Normal]" +"Mod [Normal]" #MSG_SILENT_MODE_ON c=0 r=0 "Mode [silent]" -"Mod [tichy]" +"Mod [tichy]" #MSG_STEALTH_MODE_ON c=0 r=0 "Mode [Stealth]" -"Mod [Stealth]" +"Mod [Stealth]" #MSG_AUTO_MODE_ON c=0 r=0 "Mode [auto power]" @@ -676,7 +676,7 @@ #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" -"Mod [vys. vykon]" +"Mod [vys. vykon]" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -1020,11 +1020,11 @@ #MSG_SORT_NONE c=17 r=1 "Sort: [none]" -"\x00" +"Trideni [Zadne]" #MSG_SORT_TIME c=17 r=1 "Sort: [time]" -"\x00" +"Trideni [Cas]" #MSG_SORT_ALPHA c=17 r=1 "Sort: [alphabet]" @@ -1036,19 +1036,19 @@ #MSG_SOUND_LOUD c=17 r=1 "Sound [loud]" -"Zvuk [hlasity]" +"Zvuk [hlasity]" #MSG_SOUND_MUTE c=17 r=1 "Sound [mute]" -"Zvuk [vypnuto]" +"Zvuk [vypnuto]" #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" -"Zvuk [jednou]" +"Zvuk [jednou]" #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -"Zvuk [tichy]" +"Zvuk [tichy]" #MSG_SPEED c=0 r=0 "Speed" @@ -1092,7 +1092,7 @@ #MSG_TEMP_CALIBRATION_ON c=20 r=1 "Temp. cal. [on]" -"Tepl. kal. [zap]" +"Tepl. kal. [zap]" #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" @@ -1256,8 +1256,8 @@ #MSG_LOAD_FILAMENT_5 c=17 r=0 "Load filament 5" -"\x00" +"Zavest filament 5" #MSG_OFF c=0 r=0 " [off]" -"\x00" +" [vyp]" From 17090f02803eca8a95449be0235ba2128ea4aa58 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 11 Sep 2018 21:19:35 +0200 Subject: [PATCH 20/25] Lang update - cz fixed --- lang/lang_en_cz.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 2d5c7cdf..3398180b 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -508,7 +508,7 @@ #MSG_FILAMENT c=17 r=1 "Filament" -"\x00" +"Filament" #MSG_WIZARD_XYZ_CAL c=20 r=8 "I will run xyz calibration now. It will take approx. 12 mins." From 36dd8eee6c873d2ddf8508a72d51c3ab7db308cc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 21:38:59 +0200 Subject: [PATCH 21/25] space --- lang/lang_en_cz.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3398180b..6c593328 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -936,11 +936,11 @@ #MSG_SECOND_SERIAL_ON c=17 r=1 "RPi port [on]" -"RPi port [zap]" +"RPi port [zap]" #MSG_SECOND_SERIAL_OFF c=17 r=1 "RPi port [off]" -"RPi port [vyp]" +"RPi port [vyp]" #MSG_WIZARD_RERUN c=20 r=7 "Running Wizard will delete current calibration results and start from the beginning. Continue?" @@ -948,7 +948,7 @@ #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 "SD card [normal]" -"SD card [normal]" +"SD card [normal]" #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 "SD card [FlshAir]" @@ -1096,7 +1096,7 @@ #MSG_TEMP_CALIBRATION_OFF c=20 r=1 "Temp. cal. [off]" -"Tepl. kal. [vyp]" +"Tepl. kal. [vyp]" #MSG_CALIBRATION_PINDA_MENU c=17 r=1 "Temp. calibration" From 3e84bf6341083367f21fce121a9d615d1dfb9243 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Wed, 12 Sep 2018 02:45:13 +0200 Subject: [PATCH 22/25] Lang update (translation + increased reserved space) --- Firmware/config.h | 2 +- lang/lang_en.txt | 18 ++++++++++++++++++ lang/lang_en_cz.txt | 24 ++++++++++++++++++++++++ lang/lang_en_de.txt | 24 ++++++++++++++++++++++++ lang/lang_en_es.txt | 24 ++++++++++++++++++++++++ lang/lang_en_it.txt | 24 ++++++++++++++++++++++++ lang/lang_en_pl.txt | 24 ++++++++++++++++++++++++ 7 files changed, 139 insertions(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index 4c01eb3e..ae7fde07 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -45,7 +45,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (~10kb) +#define LANG_SIZE_RESERVED 0x2a00 // reserved space for secondary language (~10kb) #endif //_CONFIG_H diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e5c6ebd2..b7318939 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -157,6 +157,9 @@ #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." +# +"Crash detected. Resume print?" + #MSG_CURRENT c=19 r=1 "Current" @@ -436,6 +439,9 @@ #MSG_BED_CORRECTION_LEFT c=14 r=1 "Left side [um]" +# +"Lin. correction" + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" @@ -667,6 +673,9 @@ #MSG_ERR_STOPPED c=0 r=0 "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." @@ -757,6 +766,9 @@ #MSG_SHOW_END_STOPS c=17 r=1 "Show end stops" +# +"Show pinda state" + #MSG_DWELL c=0 r=0 "Sleep..." @@ -841,6 +853,12 @@ #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." +# +"Total filament" + +# +"Total print time" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3398180b..32315ec3 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -210,6 +210,10 @@ "Crash detected." "Detekovan naraz." +# +"Crash detected. Resume print?" +"Detekovan naraz. Pokracovat?" + #MSG_CURRENT c=19 r=1 "Current" "Pouze aktualni" @@ -582,6 +586,10 @@ "Left side [um]" "Vlevo [um]" +# +"Lin. correction" +"Korekce lin." + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" "Doladeni osy Z" @@ -890,6 +898,10 @@ "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" "\x00" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." +"Prusa i3 MK2.5 ok" + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." "Prusa i3 MK3 ok" @@ -1010,6 +1022,10 @@ "Show end stops" "Stav konc. spin." +# +"Show pinda state" +"Stav PINDA" + #MSG_DWELL c=0 r=0 "Sleep..." "\x00" @@ -1122,6 +1138,14 @@ "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." +# +"Total filament" +"Celkem fileament" + +# +"Total print time" +"Celkovy cas tisku" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index cb3979ed..731ce35b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -210,6 +210,10 @@ "Crash detected." "Crash erkannt." +# +"Crash detected. Resume print?" +"Crash erkannt. Druck fortsetzen?" + #MSG_CURRENT c=19 r=1 "Current" "Aktuelles" @@ -582,6 +586,10 @@ "Left side [um]" "Links [um]" +# +"Lin. correction" +"\x00" + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" "Z einstellen" @@ -890,6 +898,10 @@ "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" "Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." +"Prusa i3 MK2.5 bereit" + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." "Prusa i3 MK3 bereit." @@ -1010,6 +1022,10 @@ "Show end stops" "Endschalter Status" +# +"Show pinda state" +"\x00" + #MSG_DWELL c=0 r=0 "Sleep..." "Schlafzustand..." @@ -1122,6 +1138,14 @@ "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "Es ist noch notwendig die Z-Kalibrierung auszufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." +# +"Total filament" +"\x00" + +# +"Total print time" +"\x00" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "AUSGELOEST" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 6937b597..56acb2c2 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -210,6 +210,10 @@ "Crash detected." "Choque detectado." +# +"Crash detected. Resume print?" +"Choque detectado. Reanudar impres?" + #MSG_CURRENT c=19 r=1 "Current" "Actual" @@ -582,6 +586,10 @@ "Left side [um]" "Izquierda [um]" +# +"Lin. correction" +"\x00" + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" "Micropaso Eje Z" @@ -890,6 +898,10 @@ "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" "Impresora parada debido a errores. Arregle el error y use M999 para reinicio. (Temperatura se resetea. Ajustar despues de reinicio)" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." +"Prusa i3 MK2.5 prep." + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." "Prusa i3 MK3 prep." @@ -1010,6 +1022,10 @@ "Show end stops" "Mostrar endstops" +# +"Show pinda state" +"\x00" + #MSG_DWELL c=0 r=0 "Sleep..." "En reposo..." @@ -1122,6 +1138,14 @@ "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." +# +"Total filament" +"\x00" + +# +"Total print time" +"\x00" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "ACTIVADO" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bf115700..799d235d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -210,6 +210,10 @@ "Crash detected." "Rilevato impatto." +# +"Crash detected. Resume print?" +"Rilevato impatto. Riprendi stampa?" + #MSG_CURRENT c=19 r=1 "Current" "Attuale" @@ -582,6 +586,10 @@ "Left side [um]" "Lato sinistro [um]" +# +"Lin. correction" +"\x00" + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" "Compensazione Z" @@ -890,6 +898,10 @@ "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" "La stampante si e fermata a causa di errori. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." +"Prusa i3 MK2.5 pronta" + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." "Prusa i3 MK3 pronta." @@ -1010,6 +1022,10 @@ "Show end stops" "Stato finecorsa" +# +"Show pinda state" +"\x00" + #MSG_DWELL c=0 r=0 "Sleep..." "Sospensione..." @@ -1122,6 +1138,14 @@ "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." +# +"Total filament" +"\x00" + +# +"Total print time" +"\x00" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "ATTIVATO" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a6000744..896fae13 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -210,6 +210,10 @@ "Crash detected." "Zderzenie wykryte." +# +"Crash detected. Resume print?" +"Zderzenie wykryte. Wznowic wydruk?" + #MSG_CURRENT c=19 r=1 "Current" "Aktualne" @@ -582,6 +586,10 @@ "Left side [um]" "Lewo [um]" +# +"Lin. correction" +"\x00" + #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" "Dostrajanie osi Z" @@ -890,6 +898,10 @@ "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" "Drukarka zatrzymana z powodu bledow. Usun problem i uzyj M999 aby zrestartowac. (Temperatura jest zresetowana, ustaw ja po restarcie)" +#WELCOME_MSG c=20 r=0 +"Prusa i3 MK2.5 ready." +"Prusa i3 MK2.5 gotowa" + #WELCOME_MSG c=20 r=0 "Prusa i3 MK3 ready." "Prusa i3 MK3 gotowa." @@ -1010,6 +1022,10 @@ "Show end stops" "Pokaz krancowki" +# +"Show pinda state" +"\x00" + #MSG_DWELL c=0 r=0 "Sleep..." "Czuwanie..." @@ -1122,6 +1138,14 @@ "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." +# +"Total filament" +"\x00" + +# +"Total print time" +"\x00" + #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" "AKTYWOWANO" From 298950e6011d15e3dc302b4beaa5885b3f79fe85 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 12 Sep 2018 09:19:23 +0200 Subject: [PATCH 23/25] changed version --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7c6d95cf..7f0507c4 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.4.0-RC2" -#define FW_COMMIT_NR 1267 +#define FW_VERSION "3.4.0" +#define FW_COMMIT_NR 1325 // 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 45066ebddc59a671ab778299774d7ccd38e77810 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 12 Sep 2018 09:37:16 +0200 Subject: [PATCH 24/25] lang fix --- Firmware/Configuration.h | 2 +- lang/lang_en_cz.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7f0507c4..6361d891 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -8,7 +8,7 @@ // Firmware version #define FW_VERSION "3.4.0" -#define FW_COMMIT_NR 1325 +#define FW_COMMIT_NR 1327 // 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 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 6c593328..b0c8f4a6 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -252,7 +252,7 @@ #MSG_EJECT_FILAMENT4 c=17 r=1 "Eject filament 4" -"Vysunout filament 5" +"Vysunout filament 4" #MSG_EJECT_FILAMENT5 c=17 r=1 "Eject filament 5" From 7bc46323e27b6a3a8807bf700e6b9925d888ddcc Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Sep 2018 18:35:26 +0200 Subject: [PATCH 25/25] Update pause print documentation. --- Firmware/Marlin_main.cpp | 42 +++++++++++++++++++++++++++++----------- Firmware/doxyfile | 2 +- Firmware/ultralcd.cpp | 5 ++++- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9d641c67..b09f398c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -464,8 +464,6 @@ bool no_response = false; uint8_t important_status; uint8_t saved_filament_type; -// save/restore printing -bool saved_printing = false; // save/restore printing in case that mmu was not responding bool mmu_print_saved = false; @@ -526,17 +524,20 @@ unsigned long chdkHigh = 0; boolean chdkActive = false; #endif -// save/restore printing -static uint32_t saved_sdpos = 0; +//! @name RAM save/restore printing +//! @{ +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; 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. +//! 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; static uint8_t saved_active_extruder = 0; -static float saved_extruder_temperature = 0.0; +static float saved_extruder_temperature = 0.0; //!< Active extruder temperature static bool saved_extruder_under_pressure = false; static bool saved_extruder_relative_mode = false; -static int saved_fanSpeed = 0; +static int saved_fanSpeed = 0; //!< Print fan speed +//! @} //=========================================================================== //=============================Routines====================================== @@ -2019,6 +2020,7 @@ static int setup_for_endstop_move(bool enable_endstops_now = true) { return l_feedmultiply; } +//! @param original_feedmultiply feedmultiply to restore static void clean_up_after_endstop_move(int original_feedmultiply) { #ifdef ENDSTOPS_ONLY_FOR_HOMING enable_endstops(false); @@ -8586,9 +8588,14 @@ void restore_print_from_eeprom() { #endif //UVLO_SUPPORT -//////////////////////////////////////////////////////////////////////////////// -// save/restore printing - +//! @brief Immediately stop print moves +//! +//! Immediately stop print moves, save current extruder temperature and position to RAM. +//! If printing from sd card, position in file is saved. +//! If printing from USB, line number is saved. +//! +//! @param z_move +//! @param e_move void stop_and_save_print_to_ram(float z_move, float e_move) { if (saved_printing) return; @@ -8773,6 +8780,14 @@ void stop_and_save_print_to_ram(float z_move, float e_move) } } +//! @brief Restore print from ram +//! +//! Restore print saved by stop_and_save_print_to_ram(). Is blocking, +//! waits for extruder temperature restore, then restores position and continues +//! print moves. +//! Internaly lcd_update() is called by wait_for_heater(). +//! +//! @param e_move void restore_print_from_ram_and_continue(float e_move) { if (!saved_printing) return; @@ -8914,8 +8929,13 @@ void M600_check_state() } } +//! @brief Wait for user action +//! +//! Beep, manage nozzle heater and wait for user to start unload filament +//! If times out, active extruder temperature is set to 0. +//! +//! @param HotendTempBckp Temperature to be restored for active extruder, after user resolves MMU problem. void M600_wait_for_user(float HotendTempBckp) { - //Beep, manage nozzle heater and wait for user to start unload filament KEEPALIVE_STATE(PAUSED_FOR_USER); diff --git a/Firmware/doxyfile b/Firmware/doxyfile index 6fa1ef4f..f3805302 100644 --- a/Firmware/doxyfile +++ b/Firmware/doxyfile @@ -453,7 +453,7 @@ EXTRACT_PACKAGE = NO # included in the documentation. # The default value is: NO. -EXTRACT_STATIC = NO +EXTRACT_STATIC = YES # If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined # locally in source files will be included in the documentation. If set to NO, diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7037d2f5..8b84cc4f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1684,7 +1684,7 @@ void lcd_return_to_status() menu_depth = 0; } - +//! @brief Pause print, disable nozzle heater, move to park position void lcd_pause_print() { lcd_return_to_status(); @@ -5458,6 +5458,9 @@ 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() { lcd_return_to_status();