Ver código fonte

Remove duplicate string `Last print failures` using `MSG_LAST_PRINT_FAILURES`
Fix too long translations in Spanish and Italian for this message

3d-gussner 3 anos atrás
pai
commit
4878db7365

+ 1 - 0
Firmware/messages.c

@@ -47,6 +47,7 @@ const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////
 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_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18
+const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////c=20
 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16
 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20
 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16

+ 1 - 0
Firmware/messages.h

@@ -48,6 +48,7 @@ extern const char MSG_HOMEYZ[];
 extern const char MSG_CHOOSE_EXTRUDER[];
 extern const char MSG_CHOOSE_FILAMENT[];
 extern const char MSG_LAST_PRINT[];
+extern const char MSG_LAST_PRINT_FAILURES[];
 extern const char MSG_LOAD_FILAMENT[];
 extern const char MSG_LOADING_FILAMENT[];
 extern const char MSG_M117_V2_CALIBRATION[];

+ 10 - 10
Firmware/ultralcd.cpp

@@ -1656,7 +1656,7 @@ static void lcd_menu_fails_stats_mmu()
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Last print failures |	c=20 r=1
+//! |Last print failures |	MSG_LAST_PRINT_FAILURES c=20
 //! | MMU fails:      000|	MSG_MMU_FAILS c=14
 //! | MMU load fails: 000|	MSG_MMU_LOAD_FAILS c=14
 //! |                    |
@@ -1670,9 +1670,9 @@ static void lcd_menu_fails_stats_mmu_print()
     uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL);
     lcd_home();
     lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), 
-        _i("Last print failures"), ////c=20 r=1
-        _T(MSG_MMU_FAILS), fails, ////c=14 r=1
-        _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 r=1
+        _T(MSG_LAST_PRINT_FAILURES), ////c=20
+        _T(MSG_MMU_FAILS), fails, ////c=14
+        _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14
     menu_back_if_clicked_fb();
 }
 
@@ -1736,7 +1736,7 @@ static void lcd_menu_fails_stats_total()
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Last print failures |	c=20 r=1
+//! |Last print failures |	MSG_LAST_PRINT_FAILURES c=20
 //! | Power failures  000|	MSG_POWER_FAILURES c=14
 //! | Filam. runouts  000|	c=14 r=1
 //! | Crash   X:000 Y:000|	c=7 r=1
@@ -1753,8 +1753,8 @@ static void lcd_menu_fails_stats_print()
     lcd_home();
 #ifndef PAT9125
     lcd_printf_P(failStatsFmt,
-        _i("Last print failures"),  ////c=20 r=1
-        _T(MSG_POWER_FAILURES), power,  ////c=14 r=1
+        _T(MSG_LAST_PRINT_FAILURES),  ////c=20
+        _T(MSG_POWER_FAILURES), power,  ////c=14
         _i("Filam. runouts"), filam,  ////c=14 r=1
         _i("Crash"), crashX, crashY);  ////c=7 r=1
 #else
@@ -1763,8 +1763,8 @@ static void lcd_menu_fails_stats_print()
                       " %-16.16S%-3d\n"
                       " %-7.7S H %-3d S %-3d\n"
                       " %-7.7S X %-3d Y %-3d"),
-                 _i("Last print failures"), ////c=20 r=1
-                 _T(MSG_POWER_FAILURES), power, ////c=14 r=1
+                 _T(MSG_LAST_PRINT_FAILURES), ////c=20
+                 _T(MSG_POWER_FAILURES), power, ////c=14
                  _i("Runouts"), filam, fsensor_softfail, //c=7
                  _i("Crash"), crashX, crashY);  ////c=7 r=1
 #endif
@@ -1820,7 +1820,7 @@ static void lcd_menu_fails_stats()
     uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT);
 	lcd_home();
 	lcd_printf_P(failStatsFmt, 
-        _i("Last print failures"),   ////c=20 r=1
+        _T(MSG_LAST_PRINT_FAILURES),   ////c=20
         _i("Filam. runouts"), filamentLast,   ////c=14 r=1
         _T(MSG_TOTAL_FAILURES),  ////c=20
         _i("Filam. runouts"), filamentTotal);   ////c=14 r=1

+ 1 - 1
lang/lang_en.txt

@@ -379,7 +379,7 @@
 #MSG_STEEL_SHEET_CHECK c=20 r=2
 "Is steel sheet on heatbed?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
 
 #

+ 1 - 1
lang/lang_en_cz.txt

@@ -506,7 +506,7 @@
 "Is steel sheet on heatbed?"
 "Je tiskovy plat na podlozce?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
 "Selhani posl. tisku"
 

+ 1 - 1
lang/lang_en_de.txt

@@ -506,7 +506,7 @@
 "Is steel sheet on heatbed?"
 "Liegt das Stahlblech auf dem Heizbett?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
 "Letzte Druckfehler"
 

+ 2 - 2
lang/lang_en_es.txt

@@ -506,9 +506,9 @@
 "Is steel sheet on heatbed?"
 "?Esta colocada la lamina sobre la base"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
-"Ultimas impresiones fallidas"
+"Ultimos imp. fallos"
 
 #
 "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."

+ 1 - 1
lang/lang_en_fr.txt

@@ -506,7 +506,7 @@
 "Is steel sheet on heatbed?"
 "Est la plaque sur le plat. chauffant?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
 "Echecs derniere imp."
 

+ 2 - 2
lang/lang_en_it.txt

@@ -506,9 +506,9 @@
 "Is steel sheet on heatbed?"
 "Piastra d'acciaio su piano riscaldato?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
-"Fallimenti ultima stampa"
+"Ultimi errori stampa"
 
 #
 "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."

+ 1 - 1
lang/lang_en_pl.txt

@@ -506,7 +506,7 @@
 "Is steel sheet on heatbed?"
 "Czy plyta stal. jest na podgrzew. stole?"
 
-#
+#MSG_LAST_PRINT_FAILURES c=20
 "Last print failures"
 "Ostatnie bledy druku"