From c023fb12d58d5f6cb0ad7a11b5405377244e3879 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 11 Sep 2018 09:50:50 +0200 Subject: [PATCH 1/3] add choose filament messages --- Firmware/messages.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/messages.c b/Firmware/messages.c index 35aa90685..52c23d364 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 2/3] 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 94c972732..b41e804dc 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 2aa39a78c..44bfc59d6 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 d89587177..3626264ae 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 f1a821418..858827a89 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 7efd3e566..416db0125 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 024626693..84b19a107 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 29e2420cd..8de1c6993 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 3/3] 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 44bfc59d6..95a52bab7 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 3626264ae..354daa49d 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 84b19a107..c2bbeb72a 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 8de1c6993..ff6343a97 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."