From 7e88e49b4ea38b22435d80f11d4b3ad6d7b0e4fa Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 30 Sep 2023 18:06:00 +0200 Subject: [PATCH] Fix tilde in message --- Firmware/ultralcd.cpp | 6 ++---- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 8 ++++---- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 4 ++-- lang/po/Firmware_hr.po | 6 +++--- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 15 files changed, 22 insertions(+), 24 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ddba41a2c..9d3a3bd5a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2813,7 +2813,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z) } } // Let the user confirm, that the Z carriage is at the top end stoppers. - uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z~carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 + uint8_t result = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Are left and right Z-carriages all up?"), false);////MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 if (result == LCD_BUTTON_TIMEOUT) goto canceled; else if (result == LCD_LEFT_BUTTON_CHOICE) @@ -2894,9 +2894,7 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg) } for (; msg < msgend; ++ msg) { char c = char(pgm_read_byte(msg)); - if (c == '~') - c = ' '; - else if (c == '\n') { + if (c == '\n') { // Abort early if '\n' is encontered. // This character is used to force the following words to be printed on the next line. break; diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 5470a549f..cf88ff957 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -61,7 +61,7 @@ msgstr "" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index cbabfc95d..5f78221e5 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -70,8 +70,8 @@ msgstr "Okoli" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" -msgstr "Dojely oba Z voziky k~hornimu dorazu?" +msgid "Are left and right Z-carriages all up?" +msgstr "Dojely oba Z voziky k-hornimu dorazu?" #. MSG_SOUND_BLIND c=7 #: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 @@ -219,7 +219,7 @@ msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte" +"Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k hornimu dorazu. Potvrdte" " tlacitkem." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 @@ -234,7 +234,7 @@ msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" -"Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte " +"Kalibrace Z. Otacenim tlacitka posunte Z osu az k hornimu dorazu. Potvrdte " "tlacitkem." #. MSG_CALIBRATING_HOME c=20 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 7967cc104..c4998e9ed 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -70,7 +70,7 @@ msgstr "Raumtemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index a98b34175..fd4d37683 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -70,7 +70,7 @@ msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index c142a85ed..544cc6cf5 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -70,8 +70,8 @@ msgstr "Ambiant" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" -msgstr "Z~carriages gauche + droite tout en haut?" +msgid "Are left and right Z-carriages all up?" +msgstr "Z-carriages gauche + droite tout en haut?" #. MSG_SOUND_BLIND c=7 #: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index a3a37dc21..fbe1b8f08 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -70,8 +70,8 @@ msgstr "Ambijent" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" -msgstr "Jesu lijevi i desni Z~nosaci podignuti?" +msgid "Are left and right Z-carriages all up?" +msgstr "Jesu lijevi i desni Z-nosaci podignuti?" #. MSG_SOUND_BLIND c=7 #: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 @@ -877,7 +877,7 @@ msgid "" "ready to print." msgstr "" "Bok, ja sam vas Original Prusa i3 printer. Vodit cu vas kroz kratak proces " -"postavljanja, u kojem ce se kalibrirati Z~os. Tada cete biti spremni za " +"postavljanja, u kojem ce se kalibrirati Z-os. Tada cete biti spremni za " "printanje." #. MSG_WIZARD_WELCOME c=20 r=7 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 8f6cb8614..23a201feb 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -70,7 +70,7 @@ msgstr "Kornyezet" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "A Z tengely a felso vegponton van?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 19c0a5780..556134b43 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -70,7 +70,7 @@ msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 93323828c..3512b7900 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -70,7 +70,7 @@ msgstr "Kamertemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Zijn beide Z wagen heelemaal boven?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 731f05efb..a0f7db883 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -70,7 +70,7 @@ msgstr "Omgivelse" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Er venstre og høyre Z-vogn helt oppe?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index d7d2ad8d2..6d582e2e2 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -70,7 +70,7 @@ msgstr "Otoczenie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 97c61e9c1..3880edca0 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -70,7 +70,7 @@ msgstr "Ambiental" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Este axa Z aliniată sus?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 437d194f4..8c5a4d870 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -70,7 +70,7 @@ msgstr "Okolie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Došli oba Z vozíky k hornému dorazu?" #. MSG_SOUND_BLIND c=7 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index b5e333df7..7ed311907 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -70,7 +70,7 @@ msgstr "Omgivande" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #: ../../Firmware/ultralcd.cpp:2826 -msgid "Are left and right Z~carriages all up?" +msgid "Are left and right Z-carriages all up?" msgstr "Är båda Z-vagnarna helt uppe?" #. MSG_SOUND_BLIND c=7