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

Remove duplicate string `Crash` using `MSG_CRASH` 

Better Italian translation, thanks to @wavexx
Fix Polish translation as it was too long for the menue and caused LCD issues.
This commit is contained in:
3d-gussner 2021-01-25 18:53:53 +01:00
parent 4878db7365
commit 10bbd64b41
10 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/messages.c
View File

@ -21,6 +21,7 @@ const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////

1
Firmware/messages.h
View File

@ -22,6 +22,7 @@ extern const char MSG_CALIBRATE_Z_AUTO[];
extern const char MSG_CARD_MENU[]; extern const char MSG_CARD_MENU[];
extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[];
extern const char MSG_COOLDOWN[]; extern const char MSG_COOLDOWN[];
extern const char MSG_CRASH[];
extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASH_DETECTED[];
extern const char MSG_CRASHDETECT[]; extern const char MSG_CRASHDETECT[];
extern const char MSG_ERROR[]; extern const char MSG_ERROR[];

10
Firmware/ultralcd.cpp
View File

@ -1712,7 +1712,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%-
//! |Total failures | MSG_TOTAL_FAILURES c=20 //! |Total failures | MSG_TOTAL_FAILURES c=20
//! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Power failures: 000| MSG_POWER_FAILURES c=14
//! | Filam. runouts: 000| c=14 r=1 //! | Filam. runouts: 000| c=14 r=1
//! | Crash X:000 Y:000| c=7 r=1 //! | Crash X:000 Y:000| MSG_CRASH c=7
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@ -1728,7 +1728,7 @@ static void lcd_menu_fails_stats_total()
_T(MSG_TOTAL_FAILURES), ////c=20 _T(MSG_TOTAL_FAILURES), ////c=20
_T(MSG_POWER_FAILURES), power, ////c=14 _T(MSG_POWER_FAILURES), power, ////c=14
_i("Filam. runouts"), filam, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1
_i("Crash"), crashX, crashY); ////c=7 r=1 _T(MSG_CRASH), crashX, crashY); ////c=7
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }
@ -1739,7 +1739,7 @@ static void lcd_menu_fails_stats_total()
//! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! |Last print failures | MSG_LAST_PRINT_FAILURES c=20
//! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Power failures 000| MSG_POWER_FAILURES c=14
//! | Filam. runouts 000| c=14 r=1 //! | Filam. runouts 000| c=14 r=1
//! | Crash X:000 Y:000| c=7 r=1 //! | Crash X:000 Y:000| MSG_CRASH c=7
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@ -1756,7 +1756,7 @@ static void lcd_menu_fails_stats_print()
_T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_LAST_PRINT_FAILURES), ////c=20
_T(MSG_POWER_FAILURES), power, ////c=14 _T(MSG_POWER_FAILURES), power, ////c=14
_i("Filam. runouts"), filam, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1
_i("Crash"), crashX, crashY); ////c=7 r=1 _T(MSG_CRASH), crashX, crashY); ////c=7
#else #else
// On the MK3 include detailed PAT9125 statistics about soft failures // On the MK3 include detailed PAT9125 statistics about soft failures
lcd_printf_P(PSTR("%S\n" lcd_printf_P(PSTR("%S\n"
@ -1766,7 +1766,7 @@ static void lcd_menu_fails_stats_print()
_T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_LAST_PRINT_FAILURES), ////c=20
_T(MSG_POWER_FAILURES), power, ////c=14 _T(MSG_POWER_FAILURES), power, ////c=14
_i("Runouts"), filam, fsensor_softfail, //c=7 _i("Runouts"), filam, fsensor_softfail, //c=7
_i("Crash"), crashX, crashY); ////c=7 r=1 _T(MSG_CRASH), crashX, crashY); ////c=7
#endif #endif
menu_back_if_clicked_fb(); menu_back_if_clicked_fb();
} }

2
lang/lang_en.txt
View File

@ -163,7 +163,7 @@
# #
"Crash detected. Resume print?" "Crash detected. Resume print?"
# #MSG_CRASH c=7
"Crash" "Crash"
#MSG_CURRENT c=19 r=1 #MSG_CURRENT c=19 r=1

2
lang/lang_en_cz.txt
View File

@ -218,7 +218,7 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Detekovan naraz. Obnovit tisk?" "Detekovan naraz. Obnovit tisk?"
# #MSG_CRASH c=7
"Crash" "Crash"
"Naraz" "Naraz"

2
lang/lang_en_de.txt
View File

@ -218,7 +218,7 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Crash erkannt. Druck fortfuehren?" "Crash erkannt. Druck fortfuehren?"
# #MSG_CRASH c=7
"Crash" "Crash"
"\x00" "\x00"

2
lang/lang_en_es.txt
View File

@ -218,7 +218,7 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Choque detectado. Continuar impresion?" "Choque detectado. Continuar impresion?"
# #MSG_CRASH c=7
"Crash" "Crash"
"Choque" "Choque"

2
lang/lang_en_fr.txt
View File

@ -218,7 +218,7 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Crash detecte. Poursuivre l'impression?" "Crash detecte. Poursuivre l'impression?"
# #MSG_CRASH c=7
"Crash" "Crash"
"\x00" "\x00"

4
lang/lang_en_it.txt
View File

@ -218,7 +218,7 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Scontro rilevato. Riprendere la stampa?" "Scontro rilevato. Riprendere la stampa?"
# #MSG_CRASH c=7
"Crash" "Crash"
"Impatto" "Impatto"
@ -508,7 +508,7 @@
#MSG_LAST_PRINT_FAILURES c=20 #MSG_LAST_PRINT_FAILURES c=20
"Last print failures" "Last print failures"
"Ultimi errori stampa" "Errori ultima stampa"
# #
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."

4
lang/lang_en_pl.txt
View File

@ -218,9 +218,9 @@
"Crash detected. Resume print?" "Crash detected. Resume print?"
"Wykryto zderzenie. Wznowic druk?" "Wykryto zderzenie. Wznowic druk?"
# #MSG_CRASH c=7
"Crash" "Crash"
"Zderzenie" "Zderzen"
#MSG_CURRENT c=19 r=1 #MSG_CURRENT c=19 r=1
"Current" "Current"