josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3348 from QuantumRoboticsFTC/MK3_fix_lang_c_limits 

Fix the c limit for a few translations
This commit is contained in:
Alex Voinea 2022-01-17 16:19:34 +01:00 committed by GitHub
parent 1d491e772b 669f15a269
commit 5d601e5ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/messages.c
View File

@ -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_STOPPED[] PROGMEM_I1 = ISTR("STOPPED."); ////c=20
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14 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_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_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20
const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18 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 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

8
Firmware/ultralcd.cpp
View File

@ -5920,7 +5920,7 @@ void bowden_menu() {
} }
#ifdef SNMM #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 static char snmm_stop_print_menu() { //menu for choosing which filaments will be unloaded in stop print
lcd_clear(); lcd_clear();
lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(':'); 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_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); //-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload);
//bFilamentFirstRun=true; //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); MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FILAMENT), mmu_fil_eject_menu);
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu);
#endif //MMU_HAS_CUTTER #endif //MMU_HAS_CUTTER
} else { } else {
#ifdef SNMM #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 MENU_ITEM_SUBMENU_P(_i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20
#endif #endif
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
@ -6658,7 +6658,7 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament); MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
} }
bFilamentFirstRun=true; 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); MENU_ITEM_SUBMENU_P(_T(MSG_SETTINGS), lcd_settings_menu);
if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu); if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_MENU_CALIBRATION), lcd_calibration_menu);

4
lang/lang_en.txt
View File

@ -253,7 +253,7 @@
#MSG_NOT_LOADED c=19 #MSG_NOT_LOADED c=19
"Filament not loaded" "Filament not loaded"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
#MSG_FILAMENT_USED c=19 #MSG_FILAMENT_USED c=19
@ -844,7 +844,7 @@
#MSG_TO_UNLOAD_FIL c=20 #MSG_TO_UNLOAD_FIL c=20
"to unload filament" "to unload filament"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
#MSG_UNLOADING_FILAMENT c=20 #MSG_UNLOADING_FILAMENT c=20

4
lang/lang_en_cz.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"Filament nezaveden" "Filament nezaveden"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Senzor filamentu" "Senzor filamentu"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"k vyjmuti filamentu" "k vyjmuti filamentu"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Vyjmout filament" "Vyjmout filament"

4
lang/lang_en_da.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_de.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"Fil. nicht geladen" "Fil. nicht geladen"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Filamentsensor" "Filamentsensor"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"um Filament entladen" "um Filament entladen"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Fil. entladen" "Fil. entladen"

6
lang/lang_en_es.txt
View File

@ -338,9 +338,9 @@
"Filament not loaded" "Filament not loaded"
"Fil. no introducido" "Fil. no introducido"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Sensor de filamento" "Sensor de fil."
#MSG_FILAMENT_USED c=19 #MSG_FILAMENT_USED c=19
"Filament used" "Filament used"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"para descargar fil." "para descargar fil."
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Soltar filamento" "Soltar filamento"

6
lang/lang_en_fr.txt
View File

@ -338,9 +338,9 @@
"Filament not loaded" "Filament not loaded"
"Filament non charge" "Filament non charge"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Capteur de filament" "Capteur de fil."
#MSG_FILAMENT_USED c=19 #MSG_FILAMENT_USED c=19
"Filament used" "Filament used"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"pour decharger fil." "pour decharger fil."
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Decharger fil." "Decharger fil."

4
lang/lang_en_hr.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_hu.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_it.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"Fil. non caricato" "Fil. non caricato"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Sensore filam." "Sensore filam."
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"per scaricare fil." "per scaricare fil."
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Scarica filam." "Scarica filam."

4
lang/lang_en_lb.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_lt.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_nl.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"Fil. niet geladen" "Fil. niet geladen"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Filamentsensor" "Filamentsensor"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"om fil. uitwerpen" "om fil. uitwerpen"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Fil. uitwerpen" "Fil. uitwerpen"

4
lang/lang_en_pl.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"Fil. nie zaladowany" "Fil. nie zaladowany"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"Czujnik filamentu" "Czujnik filamentu"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"aby rozlad. filament" "aby rozlad. filament"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"Rozladowanie fil" "Rozladowanie fil"

4
lang/lang_en_sl.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"

4
lang/lang_en_sv.txt
View File

@ -338,7 +338,7 @@
"Filament not loaded" "Filament not loaded"
"\x00" "\x00"
#MSG_FILAMENT_SENSOR c=20 #MSG_SELFTEST_FILAMENT_SENSOR c=17
"Filament sensor" "Filament sensor"
"\x00" "\x00"
@ -1126,7 +1126,7 @@
"to unload filament" "to unload filament"
"\x00" "\x00"
#MSG_UNLOAD_FILAMENT c=16 #MSG_UNLOAD_FILAMENT c=18
"Unload filament" "Unload filament"
"\x00" "\x00"