From 247e1bc1e3dd21f0a5b38e011a6dad9b3c1dcc06 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 21 Jun 2017 14:29:39 +0200 Subject: [PATCH] change extruder messages translations --- Firmware/language_all.cpp | 79 ++++++++++++++++++++++++++++++++++++++- Firmware/language_all.h | 14 ++++++- Firmware/language_cz.h | 8 +++- Firmware/language_de.h | 34 ++++++++++------- Firmware/language_en.h | 6 ++- Firmware/language_es.h | 6 +++ Firmware/language_it.h | 6 +++ Firmware/language_pl.h | 8 +++- Firmware/ultralcd.cpp | 16 ++++---- 9 files changed, 148 insertions(+), 29 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index f6b210d96..9ba394cc9 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -606,8 +606,18 @@ const char * const MSG_CHANGING_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_CHOOSE_EXTRUDER_EN[] PROGMEM = "Choose extruder:"; -const char * const MSG_CHOOSE_EXTRUDER_LANG_TABLE[1] PROGMEM = { - MSG_CHOOSE_EXTRUDER_EN +const char MSG_CHOOSE_EXTRUDER_CZ[] PROGMEM = "Vyberte extruder:"; +const char MSG_CHOOSE_EXTRUDER_IT[] PROGMEM = "Seleziona estrusore:"; +const char MSG_CHOOSE_EXTRUDER_ES[] PROGMEM = "Elegir extrusor:"; +const char MSG_CHOOSE_EXTRUDER_PL[] PROGMEM = "Wybierz ekstruder"; +const char MSG_CHOOSE_EXTRUDER_DE[] PROGMEM = "Waehlen Sie Extruder"; +const char * const MSG_CHOOSE_EXTRUDER_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CHOOSE_EXTRUDER_EN, + MSG_CHOOSE_EXTRUDER_CZ, + MSG_CHOOSE_EXTRUDER_IT, + MSG_CHOOSE_EXTRUDER_ES, + MSG_CHOOSE_EXTRUDER_PL, + MSG_CHOOSE_EXTRUDER_DE }; const char MSG_CLEAN_NOZZLE_E_EN[] PROGMEM = "E calibration finished. Please clean the nozzle. Click when done."; @@ -847,6 +857,71 @@ const char * const MSG_EXTERNAL_RESET_LANG_TABLE[1] PROGMEM = { MSG_EXTERNAL_RESET_EN }; +const char MSG_EXTRUDER_EN[] PROGMEM = "Extruder"; +const char MSG_EXTRUDER_IT[] PROGMEM = "Estrusore"; +const char MSG_EXTRUDER_ES[] PROGMEM = "Extrusor"; +const char MSG_EXTRUDER_PL[] PROGMEM = "Ekstruder"; +const char * const MSG_EXTRUDER_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_EXTRUDER_EN, + MSG_EXTRUDER_EN, + MSG_EXTRUDER_IT, + MSG_EXTRUDER_ES, + MSG_EXTRUDER_PL, + MSG_EXTRUDER_EN +}; + +const char MSG_EXTRUDER_1_EN[] PROGMEM = "Extruder 1"; +const char MSG_EXTRUDER_1_IT[] PROGMEM = "Estrusore 1"; +const char MSG_EXTRUDER_1_ES[] PROGMEM = "Extrusor 1"; +const char MSG_EXTRUDER_1_PL[] PROGMEM = "Ekstruder 1"; +const char * const MSG_EXTRUDER_1_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_EXTRUDER_1_EN, + MSG_EXTRUDER_1_EN, + MSG_EXTRUDER_1_IT, + MSG_EXTRUDER_1_ES, + MSG_EXTRUDER_1_PL, + MSG_EXTRUDER_1_EN +}; + +const char MSG_EXTRUDER_2_EN[] PROGMEM = "Extruder 2"; +const char MSG_EXTRUDER_2_IT[] PROGMEM = "Estrusore 2"; +const char MSG_EXTRUDER_2_ES[] PROGMEM = "Extrusor 2"; +const char MSG_EXTRUDER_2_PL[] PROGMEM = "Ekstruder 2"; +const char * const MSG_EXTRUDER_2_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_EXTRUDER_2_EN, + MSG_EXTRUDER_2_EN, + MSG_EXTRUDER_2_IT, + MSG_EXTRUDER_2_ES, + MSG_EXTRUDER_2_PL, + MSG_EXTRUDER_2_EN +}; + +const char MSG_EXTRUDER_3_EN[] PROGMEM = "Extruder 3"; +const char MSG_EXTRUDER_3_IT[] PROGMEM = "Estrusore 3"; +const char MSG_EXTRUDER_3_ES[] PROGMEM = "Extrusor 3"; +const char MSG_EXTRUDER_3_PL[] PROGMEM = "Ekstruder 3"; +const char * const MSG_EXTRUDER_3_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_EXTRUDER_3_EN, + MSG_EXTRUDER_3_EN, + MSG_EXTRUDER_3_IT, + MSG_EXTRUDER_3_ES, + MSG_EXTRUDER_3_PL, + MSG_EXTRUDER_3_EN +}; + +const char MSG_EXTRUDER_4_EN[] PROGMEM = "Extruder 4"; +const char MSG_EXTRUDER_4_IT[] PROGMEM = "Estrusore 4"; +const char MSG_EXTRUDER_4_ES[] PROGMEM = "Extrusor 4"; +const char MSG_EXTRUDER_4_PL[] PROGMEM = "Ekstruder 4"; +const char * const MSG_EXTRUDER_4_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_EXTRUDER_4_EN, + MSG_EXTRUDER_4_EN, + MSG_EXTRUDER_4_IT, + MSG_EXTRUDER_4_ES, + MSG_EXTRUDER_4_PL, + MSG_EXTRUDER_4_EN +}; + const char MSG_E_CAL_KNOB_EN[] PROGMEM = "Rotate knob until mark reaches extruder body. Click when done."; const char MSG_E_CAL_KNOB_CZ[] PROGMEM = "Otacejte tlacitkem dokud znacka nedosahne tela extruderu. Potvrdte tlacitkem."; const char MSG_E_CAL_KNOB_IT[] PROGMEM = "Girare la manopola affinche' il segno raggiunga il corpo dell'estrusore. Click per continuare."; diff --git a/Firmware/language_all.h b/Firmware/language_all.h index 5a3ef261b..0ca88d66a 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -122,8 +122,8 @@ extern const char* const MSG_CHANGE_SUCCESS_LANG_TABLE[LANG_NUM]; #define MSG_CHANGE_SUCCESS LANG_TABLE_SELECT(MSG_CHANGE_SUCCESS_LANG_TABLE) extern const char* const MSG_CHANGING_FILAMENT_LANG_TABLE[LANG_NUM]; #define MSG_CHANGING_FILAMENT LANG_TABLE_SELECT(MSG_CHANGING_FILAMENT_LANG_TABLE) -extern const char* const MSG_CHOOSE_EXTRUDER_LANG_TABLE[1]; -#define MSG_CHOOSE_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_CHOOSE_EXTRUDER_LANG_TABLE, 0) +extern const char* const MSG_CHOOSE_EXTRUDER_LANG_TABLE[LANG_NUM]; +#define MSG_CHOOSE_EXTRUDER LANG_TABLE_SELECT(MSG_CHOOSE_EXTRUDER_LANG_TABLE) extern const char* const MSG_CLEAN_NOZZLE_E_LANG_TABLE[LANG_NUM]; #define MSG_CLEAN_NOZZLE_E LANG_TABLE_SELECT(MSG_CLEAN_NOZZLE_E_LANG_TABLE) extern const char* const MSG_CNG_SDCARD_LANG_TABLE[1]; @@ -180,6 +180,16 @@ extern const char* const MSG_ERR_STOPPED_LANG_TABLE[1]; #define MSG_ERR_STOPPED LANG_TABLE_SELECT_EXPLICIT(MSG_ERR_STOPPED_LANG_TABLE, 0) extern const char* const MSG_EXTERNAL_RESET_LANG_TABLE[1]; #define MSG_EXTERNAL_RESET LANG_TABLE_SELECT_EXPLICIT(MSG_EXTERNAL_RESET_LANG_TABLE, 0) +extern const char* const MSG_EXTRUDER_LANG_TABLE[LANG_NUM]; +#define MSG_EXTRUDER LANG_TABLE_SELECT(MSG_EXTRUDER_LANG_TABLE) +extern const char* const MSG_EXTRUDER_1_LANG_TABLE[LANG_NUM]; +#define MSG_EXTRUDER_1 LANG_TABLE_SELECT(MSG_EXTRUDER_1_LANG_TABLE) +extern const char* const MSG_EXTRUDER_2_LANG_TABLE[LANG_NUM]; +#define MSG_EXTRUDER_2 LANG_TABLE_SELECT(MSG_EXTRUDER_2_LANG_TABLE) +extern const char* const MSG_EXTRUDER_3_LANG_TABLE[LANG_NUM]; +#define MSG_EXTRUDER_3 LANG_TABLE_SELECT(MSG_EXTRUDER_3_LANG_TABLE) +extern const char* const MSG_EXTRUDER_4_LANG_TABLE[LANG_NUM]; +#define MSG_EXTRUDER_4 LANG_TABLE_SELECT(MSG_EXTRUDER_4_LANG_TABLE) extern const char* const MSG_E_CAL_KNOB_LANG_TABLE[LANG_NUM]; #define MSG_E_CAL_KNOB LANG_TABLE_SELECT(MSG_E_CAL_KNOB_LANG_TABLE) extern const char* const MSG_Enqueing_LANG_TABLE[1]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index db16cd21c..5f2e36af5 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -295,4 +295,10 @@ #define MSG_PREPARE_FILAMENT "Pripravte filament" #define MSG_ALL "Vse" #define MSG_USED "Pouzite behem tisku" -#define MSG_CURRENT "Pouze aktualni" \ No newline at end of file +#define MSG_CURRENT "Pouze aktualni" +#define MSG_CHOOSE_EXTRUDER "Vyberte extruder:" +#define MSG_EXTRUDER "Extruder" +#define MSG_EXTRUDER_1 "Extruder 1" +#define MSG_EXTRUDER_2 "Extruder 2" +#define MSG_EXTRUDER_3 "Extruder 3" +#define MSG_EXTRUDER_4 "Extruder 4" \ No newline at end of file diff --git a/Firmware/language_de.h b/Firmware/language_de.h index 8971807c0..fe5f41825 100644 --- a/Firmware/language_de.h +++ b/Firmware/language_de.h @@ -295,17 +295,23 @@ #define MSG_TEMP_CALIBRATION_ON "Temp. Kal. [ON]" #define MSG_TEMP_CALIBRATION_OFF "Temp. Kal. [OFF]" -#define MSG_LOAD_ALL "Alle laden" -#define MSG_LOAD_FILAMENT_1 "Filament 1 laden" -#define MSG_LOAD_FILAMENT_2 "Filament 2 laden" -#define MSG_LOAD_FILAMENT_3 "Filament 3 laden" -#define MSG_LOAD_FILAMENT_4 "Filament 4 laden" -#define MSG_UNLOAD_FILAMENT_1 "Filam. 1 entladen" -#define MSG_UNLOAD_FILAMENT_2 "Filam. 2 entladen" -#define MSG_UNLOAD_FILAMENT_3 "Filam. 3 entladen" -#define MSG_UNLOAD_FILAMENT_4 "Filam. 4 entladen" -#define MSG_UNLOAD_ALL "Alles entladen" -#define MSG_PREPARE_FILAMENT "Filam. bereithalten" -#define MSG_ALL "Alle" -#define MSG_USED "Beim Druck benutzte" -#define MSG_CURRENT "Aktuelles" \ No newline at end of file +#define MSG_LOAD_ALL "Alle laden" +#define MSG_LOAD_FILAMENT_1 "Filament 1 laden" +#define MSG_LOAD_FILAMENT_2 "Filament 2 laden" +#define MSG_LOAD_FILAMENT_3 "Filament 3 laden" +#define MSG_LOAD_FILAMENT_4 "Filament 4 laden" +#define MSG_UNLOAD_FILAMENT_1 "Filam. 1 entladen" +#define MSG_UNLOAD_FILAMENT_2 "Filam. 2 entladen" +#define MSG_UNLOAD_FILAMENT_3 "Filam. 3 entladen" +#define MSG_UNLOAD_FILAMENT_4 "Filam. 4 entladen" +#define MSG_UNLOAD_ALL "Alles entladen" +#define MSG_PREPARE_FILAMENT "Filam. bereithalten" +#define MSG_ALL "Alle" +#define MSG_USED "Beim Druck benutzte" +#define MSG_CURRENT "Aktuelles" +#define MSG_CHOOSE_EXTRUDER "Waehlen Sie Extruder" +#define MSG_EXTRUDER "Extruder" +#define MSG_EXTRUDER_1 "Extruder 1" +#define MSG_EXTRUDER_2 "Extruder 2" +#define MSG_EXTRUDER_3 "Extruder 3" +#define MSG_EXTRUDER_4 "Extruder 4" \ No newline at end of file diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 3e4b4bdce..2cc2824e6 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -297,5 +297,9 @@ #define(length=19, lines=1) MSG_USED "Used during print" #define(length=19, lines=1) MSG_CURRENT "Current" #define(length=20, lines=1) MSG_CHOOSE_EXTRUDER "Choose extruder:" - +#define(length=17, lines=1) MSG_EXTRUDER "Extruder" +#define(length=17, lines=1) MSG_EXTRUDER_1 "Extruder 1" +#define(length=17, lines=1) MSG_EXTRUDER_2 "Extruder 2" +#define(length=17, lines=1) MSG_EXTRUDER_3 "Extruder 3" +#define(length=17, lines=1) MSG_EXTRUDER_4 "Extruder 4" diff --git a/Firmware/language_es.h b/Firmware/language_es.h index aa706d817..d44cda831 100644 --- a/Firmware/language_es.h +++ b/Firmware/language_es.h @@ -290,3 +290,9 @@ #define MSG_ALL "Todos" #define MSG_USED "Usado en impresion" #define MSG_CURRENT "Actual" +#define MSG_CHOOSE_EXTRUDER "Elegir extrusor:" +#define MSG_EXTRUDER "Extrusor" +#define MSG_EXTRUDER_1 "Extrusor 1" +#define MSG_EXTRUDER_2 "Extrusor 2" +#define MSG_EXTRUDER_3 "Extrusor 3" +#define MSG_EXTRUDER_4 "Extrusor 4" \ No newline at end of file diff --git a/Firmware/language_it.h b/Firmware/language_it.h index ac864b2bc..629754760 100644 --- a/Firmware/language_it.h +++ b/Firmware/language_it.h @@ -281,3 +281,9 @@ #define MSG_ALL "Tutti" #define MSG_USED "Usati nella stampa" #define MSG_CURRENT "Attuale" +#define MSG_CHOOSE_EXTRUDER "Seleziona estrusore:" +#define MSG_EXTRUDER "Estrusore" +#define MSG_EXTRUDER_1 "Estrusore 1" +#define MSG_EXTRUDER_2 "Estrusore 2" +#define MSG_EXTRUDER_3 "Estrusore 3" +#define MSG_EXTRUDER_4 "Estrusore 4" \ No newline at end of file diff --git a/Firmware/language_pl.h b/Firmware/language_pl.h index 31efa9340..3cd283ded 100644 --- a/Firmware/language_pl.h +++ b/Firmware/language_pl.h @@ -292,4 +292,10 @@ #define MSG_PREPARE_FILAMENT "Przygotuj filament" #define MSG_ALL "Wszystko" #define MSG_USED "Uzyte przy druku" -#define MSG_CURRENT "Tylko aktualne" \ No newline at end of file +#define MSG_CURRENT "Tylko aktualne" +#define MSG_CHOOSE_EXTRUDER "Wybierz ekstruder" +#define MSG_EXTRUDER "Ekstruder" +#define MSG_EXTRUDER_1 "Ekstruder 1" +#define MSG_EXTRUDER_2 "Ekstruder 2" +#define MSG_EXTRUDER_3 "Ekstruder 3" +#define MSG_EXTRUDER_4 "Ekstruder 4" \ No newline at end of file diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 493ba9afc..c70d6a1a1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3008,13 +3008,13 @@ char choose_extruder_menu() { lcd.setCursor(0, 1); lcd.print(">"); for (int i = 0; i < 3; i++) { - lcd_print_at_PGM(1, i + 1, PSTR("Extruder")); + lcd_print_at_PGM(1, i + 1, MSG_EXTRUDER); } while (1) { for (int i = 0; i < 3; i++) { - lcd.setCursor(10, i+1); + lcd.setCursor(2 + strlen_P(MSG_EXTRUDER), i+1); lcd.print(first + i + 1); } @@ -3039,7 +3039,7 @@ char choose_extruder_menu() { lcd_implementation_clear(); lcd_printPGM(MSG_CHOOSE_EXTRUDER); for (int i = 0; i < 3; i++) { - lcd_print_at_PGM(1, i + 1, PSTR("Extruder")); + lcd_print_at_PGM(1, i + 1, MSG_EXTRUDER); } } } @@ -3051,7 +3051,7 @@ char choose_extruder_menu() { lcd_implementation_clear(); lcd_printPGM(MSG_CHOOSE_EXTRUDER); for (int i = 0; i < 3; i++) { - lcd_print_at_PGM(1, i + 1, PSTR("Extruder")); + lcd_print_at_PGM(1, i + 1, MSG_EXTRUDER); } } } @@ -3520,10 +3520,10 @@ static void fil_unload_menu() static void change_extr_menu(){ START_MENU(); MENU_ITEM(back, MSG_MAIN, lcd_main_menu); - MENU_ITEM(function, PSTR("Extruder 1"), extr_change_0); - MENU_ITEM(function, PSTR("Extruder 2"), extr_change_1); - MENU_ITEM(function, PSTR("Extruder 3"), extr_change_2); - MENU_ITEM(function, PSTR("Extruder 4"), extr_change_3); + MENU_ITEM(function, MSG_EXTRUDER_1, extr_change_0); + MENU_ITEM(function, MSG_EXTRUDER_2, extr_change_1); + MENU_ITEM(function, MSG_EXTRUDER_3, extr_change_2); + MENU_ITEM(function, MSG_EXTRUDER_4, extr_change_3); END_MENU(); }