From 04bfe674df36ed985faed0e80a68073d2024c62a Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 16 Oct 2019 16:32:49 +0200 Subject: [PATCH] tiny lang fixes, part 1 --- Firmware/ultralcd.cpp | 21 ++++++++++++--------- lang/lang_en_cz.txt | 2 +- lang/lang_en_es.txt | 4 ++-- lang/lang_en_pl.txt | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f4952802..d1114897 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1843,8 +1843,8 @@ static void lcd_menu_fails_stats_total() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Power failures: 000| c=14 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Power failures 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- //! @endcode @@ -1890,6 +1890,7 @@ static void lcd_menu_fails_stats() } #elif defined(FILAMENT_SENSOR) +static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-16.16S%-3d\n"; //! //! @brief Print last print and total filament run outs //! @@ -1900,9 +1901,9 @@ static void lcd_menu_fails_stats() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! |Total failures | c=20 r=1 -//! | Filam. runouts: 000| c=14 r=1 +//! | Filam. runouts 000| c=14 r=1 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1912,11 +1913,13 @@ static void lcd_menu_fails_stats() uint8_t filamentLast = eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT); uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); lcd_home(); - lcd_printf_P(PSTR("Last print failures\n" ////c=20 r=1 - " Filam. runouts %-3d\n" ////c=14 r=1 - "Total failures\n" ////c=20 r=1 - " Filam. runouts %-3d"), filamentLast, filamentTotal); ////c=14 r=1 - menu_back_if_clicked(); + lcd_printf_P(failStatsFmt, + _i("Last print failures"), ////c=20 r=1 + _i("Filam. runouts"), filamentLast, ////c=14 r=1 + _i("Total failures"), ////c=20 r=1 + _i("Filam. runouts"), filamentTotal); ////c=14 r=1 + + menu_back_if_clicked(); } #else static void lcd_menu_fails_stats() diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 64673af4..c25c9464 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Automaticke zavadeni filamentu je dostupne pouze pri zapnutem filament senzoru..." +"Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3f6007c8..4a6006af 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -72,11 +72,11 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"La carga automatica de filamento solo funciona si el sensor de filamento esta activado..." +"La carga automatica solo funciona si el sensor de filamento esta activado..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -"La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." +"La carga automatica esta activada, pulse el dial e inserte el filamento..." #MSG_SELFTEST_AXIS_LENGTH "Axis length" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 9e6d8e70..a8aa9f74 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -72,7 +72,7 @@ #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 "Autoloading filament available only when filament sensor is turned on..." -"Autoladowanie filamentu dostepne tylko gdy czujnik filamentu jest wlaczony..." +"Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..."