From 7442057aba579b2bc3fb07efd79041107c5487c9 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 16 Jan 2022 11:13:52 +0100 Subject: [PATCH 1/3] "Filament sensor" c adjustment --- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_da.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_hr.txt | 2 +- lang/lang_en_hu.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_lb.txt | 2 +- lang/lang_en_lt.txt | 2 +- lang/lang_en_nl.txt | 2 +- lang/lang_en_pl.txt | 2 +- lang/lang_en_sl.txt | 2 +- lang/lang_en_sv.txt | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index da22053ec..896680f32 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -253,7 +253,7 @@ #MSG_NOT_LOADED c=19 "Filament not loaded" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" #MSG_FILAMENT_USED c=19 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 51553a0e7..90ca1f581 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Filament nezaveden" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Senzor filamentu" diff --git a/lang/lang_en_da.txt b/lang/lang_en_da.txt index 509748741..27b3c8f8c 100644 --- a/lang/lang_en_da.txt +++ b/lang/lang_en_da.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 6c052dcd4..803fa6846 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Fil. nicht geladen" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Filamentsensor" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bf0a67281..c7220978b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Fil. no introducido" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Sensor de filamento" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d4f270356..b695ae5f0 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Filament non charge" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Capteur de filament" diff --git a/lang/lang_en_hr.txt b/lang/lang_en_hr.txt index 77c143872..e09b1d533 100644 --- a/lang/lang_en_hr.txt +++ b/lang/lang_en_hr.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_hu.txt b/lang/lang_en_hu.txt index 3b8ff5c56..07492ffe0 100644 --- a/lang/lang_en_hu.txt +++ b/lang/lang_en_hu.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 782712395..3364ace2d 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Fil. non caricato" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Sensore filam." diff --git a/lang/lang_en_lb.txt b/lang/lang_en_lb.txt index fb3a79d77..62dab3123 100644 --- a/lang/lang_en_lb.txt +++ b/lang/lang_en_lb.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_lt.txt b/lang/lang_en_lt.txt index 085229b93..7e516503d 100644 --- a/lang/lang_en_lt.txt +++ b/lang/lang_en_lt.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 46e17fc2d..c85403e82 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Fil. niet geladen" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Filamentsensor" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 5b348c7b8..ea4005924 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -338,7 +338,7 @@ "Filament not loaded" "Fil. nie zaladowany" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "Czujnik filamentu" diff --git a/lang/lang_en_sl.txt b/lang/lang_en_sl.txt index 01054bfb0..392f32665 100644 --- a/lang/lang_en_sl.txt +++ b/lang/lang_en_sl.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" diff --git a/lang/lang_en_sv.txt b/lang/lang_en_sv.txt index ca0cfd573..e6a427f66 100644 --- a/lang/lang_en_sv.txt +++ b/lang/lang_en_sv.txt @@ -338,7 +338,7 @@ "Filament not loaded" "\x00" -#MSG_FILAMENT_SENSOR c=20 +#MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" "\x00" From 93b1a6b736e65d985db119044f2e1c372d01dfca Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 16 Jan 2022 11:19:24 +0100 Subject: [PATCH 2/3] "Unload filament" c adjustment --- Firmware/messages.c | 2 +- Firmware/ultralcd.cpp | 8 ++++---- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_da.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_hr.txt | 2 +- lang/lang_en_hu.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_lb.txt | 2 +- lang/lang_en_lt.txt | 2 +- lang/lang_en_nl.txt | 2 +- lang/lang_en_pl.txt | 2 +- lang/lang_en_sl.txt | 2 +- lang/lang_en_sv.txt | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 486d78ccd..a06c707ba 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -111,7 +111,7 @@ const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=18 const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED."); ////c=20 const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14 const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12 -const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////Number 1 to 5 is added behind text e.g. "Unload filament" c=16 +const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=18 const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18 const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f137473df..4e7c7fae4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5920,7 +5920,7 @@ void bowden_menu() { } #ifdef SNMM - +#error broken MSG_UNLOAD_FILAMENT translation static char snmm_stop_print_menu() { //menu for choosing which filaments will be unloaded in stop print lcd_clear(); lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(':'); @@ -6638,14 +6638,14 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18 //-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload); //bFilamentFirstRun=true; - MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); + MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); ////MSG_UNLOAD_FILAMENT c=18 MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FILAMENT), mmu_fil_eject_menu); #ifdef MMU_HAS_CUTTER MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); #endif //MMU_HAS_CUTTER } else { #ifdef SNMM - MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), fil_unload_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), fil_unload_menu); ////MSG_UNLOAD_FILAMENT c=18 MENU_ITEM_SUBMENU_P(_i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20 #endif #ifdef FILAMENT_SENSOR @@ -6658,7 +6658,7 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament); } bFilamentFirstRun=true; - MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament); + MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament); ////MSG_UNLOAD_FILAMENT c=18 } MENU_ITEM_SUBMENU_P(_T(MSG_SETTINGS), lcd_settings_menu); if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 896680f32..45ce6d3a8 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -844,7 +844,7 @@ #MSG_TO_UNLOAD_FIL c=20 "to unload filament" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" #MSG_UNLOADING_FILAMENT c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 90ca1f581..e9d21ae75 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1126,7 +1126,7 @@ "to unload filament" "k vyjmuti filamentu" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Vyjmout filament" diff --git a/lang/lang_en_da.txt b/lang/lang_en_da.txt index 27b3c8f8c..b274501bf 100644 --- a/lang/lang_en_da.txt +++ b/lang/lang_en_da.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 803fa6846..c34521ed8 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1126,7 +1126,7 @@ "to unload filament" "um Filament entladen" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Fil. entladen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index c7220978b..f9ea85574 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1126,7 +1126,7 @@ "to unload filament" "para descargar fil." -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Soltar filamento" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index b695ae5f0..340f97065 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1126,7 +1126,7 @@ "to unload filament" "pour decharger fil." -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Decharger fil." diff --git a/lang/lang_en_hr.txt b/lang/lang_en_hr.txt index e09b1d533..ce7f24193 100644 --- a/lang/lang_en_hr.txt +++ b/lang/lang_en_hr.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_hu.txt b/lang/lang_en_hu.txt index 07492ffe0..e249688cf 100644 --- a/lang/lang_en_hu.txt +++ b/lang/lang_en_hu.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 3364ace2d..a05fe66c8 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1126,7 +1126,7 @@ "to unload filament" "per scaricare fil." -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Scarica filam." diff --git a/lang/lang_en_lb.txt b/lang/lang_en_lb.txt index 62dab3123..736cdd21f 100644 --- a/lang/lang_en_lb.txt +++ b/lang/lang_en_lb.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_lt.txt b/lang/lang_en_lt.txt index 7e516503d..be345f725 100644 --- a/lang/lang_en_lt.txt +++ b/lang/lang_en_lt.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index c85403e82..c529767ca 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1126,7 +1126,7 @@ "to unload filament" "om fil. uitwerpen" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Fil. uitwerpen" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index ea4005924..ca6c397bc 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1126,7 +1126,7 @@ "to unload filament" "aby rozlad. filament" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "Rozladowanie fil" diff --git a/lang/lang_en_sl.txt b/lang/lang_en_sl.txt index 392f32665..42ff8df74 100644 --- a/lang/lang_en_sl.txt +++ b/lang/lang_en_sl.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" diff --git a/lang/lang_en_sv.txt b/lang/lang_en_sv.txt index e6a427f66..280e37e8f 100644 --- a/lang/lang_en_sv.txt +++ b/lang/lang_en_sv.txt @@ -1126,7 +1126,7 @@ "to unload filament" "\x00" -#MSG_UNLOAD_FILAMENT c=16 +#MSG_UNLOAD_FILAMENT c=18 "Unload filament" "\x00" From 669f15a2699df38bebad0965943e3847f256a89b Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 17 Jan 2022 16:11:52 +0100 Subject: [PATCH 3/3] Make "Filament sensor" translations shorter for ES and FR --- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index f9ea85574..8276874f4 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -340,7 +340,7 @@ #MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" -"Sensor de filamento" +"Sensor de fil." #MSG_FILAMENT_USED c=19 "Filament used" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 340f97065..f0c2a84a7 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -340,7 +340,7 @@ #MSG_SELFTEST_FILAMENT_SENSOR c=17 "Filament sensor" -"Capteur de filament" +"Capteur de fil." #MSG_FILAMENT_USED c=19 "Filament used"