diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2f2f427ca..89a0b5026 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2745,8 +2745,8 @@ void lcd_move_e() //! |01234567890123456789| //! |Y distance from min | MSG_Y_DIST_FROM_MIN //! | -------------- | STR_SEPARATOR -//! |Left: 00.00mm | MSG_LEFT c=10, c=8 -//! |Right: 00.00mm | MSG_RIGHT c=10, c=8 +//! |Left: 00.00mm| MSG_LEFT c=10, c=8 +//! |Right: 00.00mm| MSG_RIGHT c=10, c=8 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -2786,10 +2786,10 @@ float _deg(float rad) //! //! @code{.unparsed} //! |01234567890123456789| -//! |Measured skew: 0.00D| MSG_MEASURED_SKEW, c=4 +//! |Measured skew :0.00D| MSG_MEASURED_SKEW c=14, c=4 //! | -------------- | STR_SEPARATOR -//! |Slight skew: 0.12D| MSG_SLIGHT_SKEW, c=4 -//! |Severe skew: 0.25D| MSG_SEVERE_SKEW, c=4 +//! |Slight skew :0.12D| MSG_SLIGHT_SKEW c=14, c=4 +//! |Severe skew :0.25D| MSG_SEVERE_SKEW c=14, c=4 //! ---------------------- //! D - Degree sysmbol LCD_STR_DEGREE //! @endcode @@ -2799,15 +2799,15 @@ static void lcd_menu_xyz_skew() float angleDiff = eeprom_read_float((float*)(EEPROM_XYZ_CAL_SKEW)); lcd_home(); lcd_printf_P(_N( - "%S:\n" + "%-14.14S:\n" "%S\n" - "%-15.15S%3.2f\x01\n" - "%-15.15S%3.2f\x01" + "%-14.14S:%3.2f\x01\n" + "%-14.14S:%3.2f\x01" ), - _i("Measured skew"), ////MSG_MEASURED_SKEW c=13 + _i("Measured skew"), ////MSG_MEASURED_SKEW c=14 separator, - _i("Slight skew:"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=13, c=4 - _i("Severe skew:"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=13, c=4 + _i("Slight skew"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=14, c=4 + _i("Severe skew"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=14, c=4 ); if (angleDiff < 100){ lcd_set_cursor(15,0); @@ -2825,8 +2825,8 @@ static void lcd_menu_xyz_skew() //! |01234567890123456789| //! |[0;0] point offset | MSG_MEASURED_OFFSET c=20 //! | -------------- | STR_SEPARATOR -//! |X: 000.00mm| c=10 -//! |Y: 000.00mm| c=10 +//! |X 00.00mm| c=10 +//! |Y 00.00mm| c=10 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -2844,9 +2844,9 @@ static void lcd_menu_xyz_offset() for (uint_least8_t i = 0; i < 2; i++) { - lcd_set_cursor((cntr[i] < 0) ? 10 : 11, i+2); + lcd_set_cursor((cntr[i] < 0) ? 13 : 14, i+2); lcd_print(cntr[i]); - lcd_puts_at_P(16, i + 2, PSTR("mm")); + lcd_puts_at_P(18, i + 2, PSTR("mm")); } menu_back_if_clicked(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 1645287e6..783d7ab81 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -448,7 +448,7 @@ #MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 "MMU OK. Resuming temperature..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" #MSG_MMU_FAILS c=15 @@ -778,8 +778,8 @@ #MSG_SORT_TIME c=8 "Time" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -790,8 +790,8 @@ #MSG_SOUND_LOUD c=7 "Loud" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 569d9668f..3bb01aae3 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Pokracuji v nahrivani..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Merene zkos." @@ -1038,9 +1038,9 @@ "Time" "Cas" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Tezke zkos.:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Tezke zkos." #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,7 +1054,7 @@ "Loud" "Hlasity" -#MSG_SLIGHT_SKEW c=13 +#MSG_SLIGHT_SKEW c=14 "Slight skew:" "Lehke zkos.:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 52f4f1e83..d59a18a58 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Temperatur wiederherstellen..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Schraeglauf" @@ -1038,9 +1038,9 @@ "Time" "Zeit" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Schwer.Schr:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Sehr Schraeg" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Laut" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Leicht.Schr:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Leicht Schraeg" #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index d5866fe1e..f27d4ce01 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -598,9 +598,9 @@ "MMU OK. Resuming temperature..." "MMU OK. Restaurando temperatura..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" -"Desviacion med:" +"Desviacion med" #MSG_MMU_FAILS c=15 "MMU fails" @@ -1038,9 +1038,9 @@ "Time" "Fecha" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Incl.severa:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Severo sesgar" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Alto" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Liger.incl.:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Ligera sesgar" #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 178d11d0c..808d67436 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Rechauffage de la buse..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Var. mesuree" @@ -1038,9 +1038,9 @@ "Time" "Heure" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Deviat.sev.:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Deviat.sev." #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Fort" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Deviat.leg.:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Deviat.leg." #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 490ca998c..34c8740a6 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Ripristino temperatura..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Dev. misurata" @@ -1038,9 +1038,9 @@ "Time" "Cron." -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Devia.grave:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Devia.grave" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Forte" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Devia.lieve:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Devia.lieve" #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index e05a29a42..b35219837 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Temperatuur hervatten..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Scheefheid" @@ -1038,9 +1038,9 @@ "Time" "Tijd" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Erg scheef:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Erg scheef" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Hard" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Iets scheef:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Beetje scheef" #MSG_SOUND c=7 "Sound" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index b51c00a38..d60dc85a7 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -598,7 +598,7 @@ "MMU OK. Resuming temperature..." "MMU OK. Wznawiam nagrzewanie..." -#MSG_MEASURED_SKEW c=13 +#MSG_MEASURED_SKEW c=14 "Measured skew" "Zmierzony skos" @@ -1038,9 +1038,9 @@ "Time" "Czas" -#MSG_SEVERE_SKEW c=13 -"Severe skew:" -"Znaczny skos:" +#MSG_SEVERE_SKEW c=14 +"Severe skew" +"Znaczny skos" #MSG_SORT_ALPHA c=8 "Alphabet" @@ -1054,9 +1054,9 @@ "Loud" "Glosny" -#MSG_SLIGHT_SKEW c=13 -"Slight skew:" -"Lekki skos:" +#MSG_SLIGHT_SKEW c=14 +"Slight skew" +"Lekki skos" #MSG_SOUND c=7 "Sound"