From 7f24c5574199f9241a7731907bd12428d944811c Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 14:35:47 +0100 Subject: [PATCH 1/5] Lang - french translation corrected --- lang/lang_en_fr.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 88206dbf8..792f13a7a 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -68,7 +68,7 @@ #MSG_AUTO_HOME c=0 r=0 "Auto home" -"Origine automatique" +"Mise a 0 des axes" #MSG_AUTOLOAD_FILAMENT c=17 r=0 "AutoLoad filament" @@ -104,7 +104,7 @@ #MSG_BED_CORRECTION_MENU c=0 r=0 "Bed level correct" -"Correction niveau lit" +"Cor courbure du lit" #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." @@ -612,7 +612,7 @@ #MSG_BABYSTEP_Z c=0 r=0 "Live adjust Z" -"Ajustement Z en direct" +"Ajuster Z en dir" #MSG_LOAD_FILAMENT c=17 r=0 "Load filament" @@ -672,7 +672,7 @@ #MSG_MESH_BED_LEVELING c=0 r=0 "Mesh Bed Leveling" -"Nivelage du lit par maillage" +"Nivelage du lit" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -804,7 +804,7 @@ #MSG_PAUSE_PRINT c=0 r=0 "Pause print" -"Mettre en pause l'impression" +"Pause de l'impres" #MSG_PID_RUNNING c=20 r=1 "PID cal. " @@ -928,7 +928,7 @@ #MSG_CARD_MENU c=0 r=0 "Print from SD" -"Imprimer depuis la SD" +"Impr depuis la SD" #MSG_PRINT_PAUSED c=20 r=1 "Print paused" @@ -1088,7 +1088,7 @@ # "Show pinda state" -"Afficher l'etat de la pinda" +"Etat de la PINDA" #MSG_DWELL c=0 r=0 "Sleep..." @@ -1216,7 +1216,7 @@ # "Total print time" -"Temps d'impression total" +"Temps total" #MSG_ENDSTOP_HIT c=0 r=0 "TRIGGERED" From f0624a9e974e37b63076ae16c23d054a9810e3b6 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 14:37:29 +0100 Subject: [PATCH 2/5] Lang - some not localized texts marked as localized, formating fixed --- Firmware/ultralcd.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5ef5afb77..90ab90b80 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1874,10 +1874,12 @@ static void lcd_menu_extruder_info() lcd_printf_P(_N( ESC_H(0,0) - "Nozzle FAN: %4d RPM\n" - "Print FAN: %4d RPM\n" + "%S: %4d RPM\n" + "%S: %4d RPM\n" ), + _i("Nozzle FAN"), fan_speed_RPM[0], + _i("Print FAN"), fan_speed_RPM[1] ); @@ -1926,7 +1928,8 @@ static void lcd_menu_fails_stats_total() uint16_t filam = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); uint16_t crashX = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT); uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); - lcd_printf_P(PSTR(ESC_H(0,0) "Total failures" ESC_H(1,1) "Power failures %-3d" ESC_H(1,2) "Filam. runouts %-3d" ESC_H(1,3) "Crash X %-3d Y %-3d"), power, filam, crashX, crashY); +// lcd_printf_P(PSTR(ESC_H(0,0) "Total failures" ESC_H(1,1) "Power failures %-3d" ESC_H(1,2) "Filam. runouts %-3d" ESC_H(1,3) "Crash X %-3d Y %-3d"), power, filam, crashX, crashY); + lcd_printf_P(PSTR(ESC_H(0,0) "%S" ESC_H(1,1) "%S %-3d" ESC_H(1,2) "%S %-3d" ESC_H(1,3) "%S X %-3d Y %-3d"), _i("Total failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); menu_back_if_clicked_fb(); } @@ -1943,7 +1946,8 @@ static void lcd_menu_fails_stats_print() uint8_t filam = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint8_t crashX = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_X); uint8_t crashY = eeprom_read_byte((uint8_t*)EEPROM_CRASH_COUNT_Y); - lcd_printf_P(PSTR(ESC_H(0,0) "Last print failures" ESC_H(1,1) "Power failures %-3d" ESC_H(1,2) "Filam. runouts %-3d" ESC_H(1,3) "Crash X %-3d Y %-3d"), power, filam, crashX, crashY); +// lcd_printf_P(PSTR(ESC_H(0,0) "Last print failures" ESC_H(1,1) "Power failures %-3d" ESC_H(1,2) "Filam. runouts %-3d" ESC_H(1,3) "Crash X %-3d Y %-3d"), power, filam, crashX, crashY); + lcd_printf_P(PSTR(ESC_H(0,0) "%S" ESC_H(1,1) "%S %-3d" ESC_H(1,2) "%S %-3d" ESC_H(1,3) "%S X %-3d Y %-3d"), _i("Last print failures"), _i("Power failures"), power, _i("Filam. runouts"), filam, _i("Crash"), crashX, crashY); menu_back_if_clicked_fb(); } /** @@ -1957,8 +1961,8 @@ static void lcd_menu_fails_stats() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(PSTR("Last print"), lcd_menu_fails_stats_print); - MENU_ITEM_SUBMENU_P(PSTR("Total"), lcd_menu_fails_stats_total); + MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); + MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); MENU_END(); } #elif defined(FILAMENT_SENSOR) @@ -2017,9 +2021,9 @@ static void lcd_menu_temperatures() { lcd_timeoutToStatus.stop(); //infinite timeout - lcd_printf_P(PSTR(ESC_H(1,0) "Nozzle: %d%c" ESC_H(1,1) "Bed: %d%c"), (int)current_temperature[0], '\x01', (int)current_temperature_bed, '\x01'); + lcd_printf_P(PSTR(ESC_H(1,0) "%S: %d%c" ESC_H(1,1) "%S: %d%c"), _i("Nozzle"), (int)current_temperature[0], '\x01', _i("Bed"), (int)current_temperature_bed, '\x01'); #ifdef AMBIENT_THERMISTOR - lcd_printf_P(PSTR(ESC_H(1,2) "Ambient: %d%c" ESC_H(1,3) "PINDA: %d%c"), (int)current_temperature_ambient, '\x01', (int)current_temperature_pinda, '\x01'); + lcd_printf_P(PSTR(ESC_H(1,2) "%S: %d%c" ESC_H(1,3) "PINDA: %d%c"), _i("Ambient"), (int)current_temperature_ambient, '\x01', (int)current_temperature_pinda, '\x01'); #else //AMBIENT_THERMISTOR lcd_printf_P(PSTR(ESC_H(1,2) "PINDA: %d%c"), (int)current_temperature_pinda, '\x01'); #endif //AMBIENT_THERMISTOR @@ -2045,7 +2049,7 @@ static void lcd_menu_voltages() #ifdef TMC2130 static void lcd_menu_belt_status() { - lcd_printf_P(PSTR(ESC_H(1,0) "Belt status" ESC_H(2,1) "X %d" ESC_H(2,2) "Y %d" ), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); + lcd_printf_P(PSTR(ESC_H(1,0) "%S" ESC_H(2,1) "X %d" ESC_H(2,2) "Y %d" ), _i("Belt status"), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); menu_back_if_clicked(); } #endif //TMC2130 @@ -2151,7 +2155,7 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); if (mmu_enabled) { - MENU_ITEM_BACK_P(PSTR("MMU2 connected")); + MENU_ITEM_BACK_P(_i("MMU2 connected")); MENU_ITEM_BACK_P(PSTR(" FW:")); if (((menu_item - 1) == menu_line) && lcd_draw_update) { @@ -2159,7 +2163,7 @@ static void lcd_support_menu() if ((mmu_version > 0) && (mmu_buildnr > 0)) lcd_printf_P(PSTR("%d.%d.%d-%d"), mmu_version/100, mmu_version%100/10, mmu_version%10, mmu_buildnr); else - lcd_puts_P(PSTR("unknown")); + lcd_puts_P(_i("unknown")); } } else @@ -5846,7 +5850,7 @@ static void lcd_main_menu() } #if defined(TMC2130) || defined(FILAMENT_SENSOR) - MENU_ITEM_SUBMENU_P(PSTR("Fail stats"), lcd_menu_fails_stats); + MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats); #endif MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=0 r=0 From 3322c31a0a71604473b189475d1cda43c9c85e5c Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 14:43:27 +0100 Subject: [PATCH 3/5] Lang - new texts added in dictionaries --- lang/lang_en.txt | 42 ++++++++++++++++++++++++++++++++++ lang/lang_en_cz.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_de.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_es.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_fr.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_it.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ lang/lang_en_pl.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 378 insertions(+) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 4383108e2..f2abe378a 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -34,6 +34,9 @@ #MSG_WIZARD_DONE c=20 r=8 "All is done. Happy printing!" +# +"Ambient" + #MSG_PRESS c=20 r=0 "and press the knob" @@ -157,6 +160,9 @@ # "Crash detected. Resume print?" +# +"Crash" + #MSG_CURRENT c=19 r=1 "Current" @@ -259,6 +265,9 @@ #MSG_FSENS_AUTOLOAD_OFF c=17 r=1 "F. autoload [off]" +# +"Fail stats" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -283,6 +292,9 @@ #MSG_FSENSOR_OFF c=0 r=0 "Fil. sensor [off]" +# +"Filam. runouts" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -442,6 +454,12 @@ #MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 "Iteration " +# +"Last print failures" + +# +"Last print" + #MSG_KILLED c=0 r=0 "KILLED. " @@ -535,6 +553,9 @@ #MSG_SILENT_MODE_OFF c=0 r=0 "Mode [high power]" +# +"MMU2 connected" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -598,6 +619,9 @@ # "Now remove the test print from steel sheet." +# +"Nozzle FAN" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" @@ -688,6 +712,9 @@ #MSG_PRESS_TO_PREHEAT c=20 r=4 "Press knob to preheat nozzle and continue." +# +"Power failures" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" @@ -709,6 +736,9 @@ #MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." +# +"Print FAN" + #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)" @@ -850,6 +880,9 @@ # "Some problem encountered, Z-leveling enforced ..." +# +"Some problem encountered, Z-levelling enforced ..." + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" @@ -925,18 +958,27 @@ # "Unload all" +# +"Total failures" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" +# +"Total" + #MSG_USED c=19 r=1 "Used during print" #MSG_MENU_VOLTAGES c=15 r=1 "Voltages" +# +"unknown" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 319606101..43b95bfc2 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Vse je hotovo." +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "a stisknete tlacitko" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Detekovan naraz. Obnovit tisk?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Pouze aktualni" @@ -346,6 +354,10 @@ "F. autoload [off]" "F. autozav. [vyp]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Rychlost vent." @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Fil. senzor [vyp]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Filament vytlacen a spravne barvy?" @@ -590,6 +606,14 @@ "Iteration " "Iterace " +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "ZRUSENO." @@ -714,6 +738,10 @@ "Mode [high power]" "Mod [vys. vykon]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "\x00" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Nyni odstrante testovaci vytisk z tiskoveho platu." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "openRoot selhal" @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Pro nahrati trysky a pokracovani stisknete tlacitko." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Tisk prerusen" @@ -946,6 +982,10 @@ "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." "Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Postup kalibrace." +# +"Print FAN" +"\x00" + #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)" "Tisk zastaven kvuli chybam. Opravte chybu a pouzijte M999 pro restart. (Teplota resetovana, nastavte ji po restartu)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Vyskytl se problem, srovnavam osu Z ..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Zvuk [jednou]" @@ -1234,6 +1278,10 @@ "Unload all" "Vyjmout vse" +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Vyjmout filament" @@ -1242,6 +1290,10 @@ "Unloading filament" "Vysouvam filament" +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Pouzite behem tisku" @@ -1250,6 +1302,10 @@ "Voltages" "Napeti" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "volume.init selhalo" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index be328416b..5c5de386e 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Alles abgeschlossen. Viel Spass beim Drucken!" +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "und Knopf druecken" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Crash erkannt. Druck fortfuehren?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Aktuelles" @@ -346,6 +354,10 @@ "F. autoload [off]" "F. Autoload [aus]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Luefter-Tempo" @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Fil. Sensor [aus]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Filament extrudiert + richtige Farbe?" @@ -590,6 +606,14 @@ "Iteration " "\x00" +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "ABGEBROCHEN. " @@ -714,6 +738,10 @@ "Mode [high power]" "Modus[Hohe Leist]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "\x00" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Testdruck jetzt von Stahlblech entfernen." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "Zugriff auf Hauptverzeichnis misslungen" @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Druck abgebrochen" @@ -946,6 +982,10 @@ "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." "Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrie- rungsablauf." +# +"Print FAN" +"\x00" + #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)" "Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Fehler aufgetreten, Z-Kalibrierung erforderlich..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Sound [einmal]" @@ -1234,6 +1278,10 @@ "Unload all" "Alles entladen" +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Filament entladen" @@ -1242,6 +1290,10 @@ "Unloading filament" "Filament auswerfen" +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Beim Druck benutzt" @@ -1250,6 +1302,10 @@ "Voltages" "Spannungen" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "Dateisystem Init fehlerhaft" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 5f5d92ad6..26e7a388b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Terminado! Feliz impresion!" +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "Haz clic" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Choque detectado. Continuar impresion?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Actual" @@ -346,6 +354,10 @@ "F. autoload [off]" "Autocarg.Fil[ina]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Velocidad Vent." @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Sensor Fil. [ina]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Es nitido el color nuevo?" @@ -590,6 +606,14 @@ "Iteration " "Reiteracion " +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "PARADA DE EMERGENCIA" @@ -714,6 +738,10 @@ "Mode [high power]" "Modo [rend.pleno]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "\x00" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Ahora retira la prueba de la lamina de acero." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "fallo openRoot " @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Pulsa el dial para precalentar la boquilla y continue." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Impresion cancelada" @@ -946,6 +982,10 @@ "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 Calibracion flujo." +# +"Print FAN" +"\x00" + #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)" "Impresora parada debido a errores. Arregle el error y use M999 para reinicio. (Temperatura se resetea. Ajustar despues de reinicio)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Problema encontrado, nivelacion Z forzosa ..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Sonido [una vez]" @@ -1234,6 +1278,10 @@ "Unload all" "Soltar todos fil." +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Soltar filamento" @@ -1242,6 +1290,10 @@ "Unloading filament" "Soltando filamento" +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Usado en impresion" @@ -1250,6 +1302,10 @@ "Voltages" "Voltajes" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "fallo volume.init" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 792f13a7a..b97240348 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Tout est termine. Bonne impression !" +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "et pressez le bouton" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Crash detecte. Poursuivre l'impression ?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Actuel" @@ -346,6 +354,10 @@ "F. autoload [off]" "AutoCharg F [off]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Vitesse ventil" @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Capteur Fil.[off]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Filament extrude et avec bonne couleur ?" @@ -590,6 +606,14 @@ "Iteration " "\x00" +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "TUE." @@ -714,6 +738,10 @@ "Mode [high power]" "Mode[haute puiss]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "Moteur" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Retirez maintenant l'impression de test de la feuille d'acier." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "Echec openRoot" @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Appuyez sur le bouton pour prechauffer la buse et continuer." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Impression annulee" @@ -946,6 +982,10 @@ "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" +# +"Print FAN" +"\x00" + #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)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Problemes rencontres, nivellement de l'axe Z applique..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Son [une fois]" @@ -1234,6 +1278,10 @@ "Unload all" "Decharger tout" +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Decharger fil." @@ -1242,6 +1290,10 @@ "Unloading filament" "Dechargement fil." +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Utilise pdt impr." @@ -1250,6 +1302,10 @@ "Voltages" "Tensions" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "Echec volume.init" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 134890e1f..a2b9e7a22 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Tutto fatto. Buona stampa!" +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "e cliccare manopola" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Scontro rilevato. Riprendere la stampa?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Attuale" @@ -346,6 +354,10 @@ "F. autoload [off]" "Autocar.fil.[off]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Velocita ventola" @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Sensor filam[off]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Filamento estruso & con il giusto colore?" @@ -590,6 +606,14 @@ "Iteration " "Iterazione" +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "IN TILT." @@ -714,6 +738,10 @@ "Mode [high power]" "Mode [forte]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "Motore" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Ora rimuovete la stampa di prova dalla piastra in acciaio." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "openRoot fallito" @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Premete la manopola per preriscaldare l'ugello e continuare." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Stampa interrotta" @@ -946,6 +982,10 @@ "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." "Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione." +# +"Print FAN" +"\x00" + #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. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Sono stati rilevati problemi, avviato livellamento Z ..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Suono [singolo]" @@ -1234,6 +1278,10 @@ "Unload all" "Rilasciare tutti" +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Scarica filam." @@ -1242,6 +1290,10 @@ "Unloading filament" "Scaricando filamento" +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Usati nella stampa" @@ -1250,6 +1302,10 @@ "Voltages" "Voltaggi" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "volume.init fallito" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 51f0b65bf..1bf241411 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -46,6 +46,10 @@ "All is done. Happy printing!" "Gotowe. Udanego drukowania!" +# +"Ambient" +"\x00" + #MSG_PRESS c=20 r=0 "and press the knob" "i nacisnij pokretlo" @@ -210,6 +214,10 @@ "Crash detected. Resume print?" "Wykryto zderzenie. Wznowic druk?" +# +"Crash" +"\x00" + #MSG_CURRENT c=19 r=1 "Current" "Aktualne" @@ -346,6 +354,10 @@ "F. autoload [off]" "Autolad.fil.[wyl]" +# +"Fail stats" +"\x00" + #MSG_FAN_SPEED c=14 r=0 "Fan speed" "Predkosc went." @@ -378,6 +390,10 @@ "Fil. sensor [off]" "Czuj. filam.[wyl]" +# +"Filam. runouts" +"\x00" + #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" "Filament wychodzi z dyszy a kolor jest czysty?" @@ -590,6 +606,14 @@ "Iteration " "Iteracja " +# +"Last print failures" +"\x00" + +# +"Last print" +"\x00" + #MSG_KILLED c=0 r=0 "KILLED. " "PRZERWANE." @@ -714,6 +738,10 @@ "Mode [high power]" "Tryb[wysoka wyd.]" +# +"MMU2 connected" +"\x00" + #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" "Silnik" @@ -798,6 +826,10 @@ "Now remove the test print from steel sheet." "Teraz zdejmij wydruk testowy ze stolu." +# +"Nozzle FAN" +"\x00" + #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" "niepowodzenie openRoot " @@ -918,6 +950,10 @@ "Press knob to preheat nozzle and continue." "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." +# +"Power failures" +"\x00" + #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" "Druk przerwany" @@ -946,6 +982,10 @@ "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." "Drukarka nie zostala jeszcze skalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." +# +"Print FAN" +"\x00" + #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)" "Drukarka zatrzymana z powodu bledow. Usun problem i uzyj M999 aby zrestartowac. (Temperatura jest zresetowana, ustaw ja po restarcie)" @@ -1134,6 +1174,10 @@ "Some problem encountered, Z-leveling enforced ..." "Wykryto problem, wymuszono poziomowanie osi Z ..." +# +"Some problem encountered, Z-levelling enforced ..." +"\x00" + #MSG_SOUND_ONCE c=17 r=1 "Sound [once]" "Dzwiek [1-raz]" @@ -1234,6 +1278,10 @@ "Unload all" "Rozladuj wszystkie" +# +"Total failures" +"\x00" + #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" "Rozladowanie fil." @@ -1242,6 +1290,10 @@ "Unloading filament" "Rozladowuje filament" +# +"Total" +"\x00" + #MSG_USED c=19 r=1 "Used during print" "Uzyte podczas druku" @@ -1250,6 +1302,10 @@ "Voltages" "Napiecia" +# +"unknown" +"\x00" + #MSG_SD_VOL_INIT_FAIL c=0 r=0 "volume.init failed" "niepowodzenie volume.init " From de9e1d4a1390d13834b2a4cd799d4350e58a2a89 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 14:52:19 +0100 Subject: [PATCH 4/5] Lang - translations in french dictionary added --- lang/lang_en_fr.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index b97240348..fffc03706 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -48,7 +48,7 @@ # "Ambient" -"\x00" +"Ambiant" #MSG_PRESS c=20 r=0 "and press the knob" @@ -164,7 +164,7 @@ #MSG_MENU_CALIBRATION c=0 r=0 "Calibration" -"\x00" +"Calibration" # "Cancel" @@ -216,7 +216,7 @@ # "Crash" -"\x00" +"Colision" #MSG_CURRENT c=19 r=1 "Current" @@ -356,7 +356,7 @@ # "Fail stats" -"\x00" +"Statist. d'echec" #MSG_FAN_SPEED c=14 r=0 "Fan speed" @@ -392,7 +392,7 @@ # "Filam. runouts" -"\x00" +"Manque de flm" #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" @@ -608,11 +608,11 @@ # "Last print failures" -"\x00" +"Echecs d'impr. dern." # "Last print" -"\x00" +"Derniere impress." #MSG_KILLED c=0 r=0 "KILLED. " @@ -740,7 +740,7 @@ # "MMU2 connected" -"\x00" +"MMU2 connectée" #MSG_SELFTEST_MOTOR c=0 r=0 "Motor" @@ -828,7 +828,7 @@ # "Nozzle FAN" -"\x00" +"Vent buse" #MSG_SD_OPENROOT_FAIL c=0 r=0 "openRoot failed" @@ -952,7 +952,7 @@ # "Power failures" -"\x00" +"Coupures" #MSG_PRINT_ABORTED c=20 r=0 "Print aborted" @@ -984,7 +984,7 @@ # "Print FAN" -"\x00" +"Vent extru" #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)" @@ -1280,7 +1280,7 @@ # "Total failures" -"\x00" +"Echecs au total" #MSG_UNLOAD_FILAMENT c=17 r=0 "Unload filament" @@ -1292,7 +1292,7 @@ # "Total" -"\x00" +"Total" #MSG_USED c=19 r=1 "Used during print" From 224623a409426abcbe0fcefa489d78ba32cdf03e Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 22 Nov 2018 15:20:58 +0100 Subject: [PATCH 5/5] Lang - french translation fixed --- lang/lang_en_fr.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index fffc03706..bc58ea2ae 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -244,11 +244,11 @@ #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" -"Ejecter le filament" +"Ejecter filament" #MSG_EJECT_FILAMENT1 c=17 r=1 "Eject filament 1" -"Ejecter le filament 1" +"Ejecter fil. 1" #MSG_EJECT_FILAMENT2 c=17 r=1 "Eject filament 2" @@ -560,7 +560,7 @@ #MSG_WATCH c=0 r=0 "Info screen" -"Ecran d'informations" +"Ecran d'info" #MSG_FILAMENT_LOADING_T0 c=20 r=4 "Insert filament into extruder 1. Click when done." @@ -664,7 +664,7 @@ # "Load to nozzle" -"Charger dans la buse" +"Charger dans buse" #MSG_M109_INVALID_EXTRUDER c=0 r=0 "M109 Invalid extruder "