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

Fix tilde in message

This commit is contained in:
Alex Voinea 2023-09-30 18:06:00 +02:00
parent 32cee8b529
commit 7e88e49b4e
15 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/ultralcd.cpp
View File

@ -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. // 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) if (result == LCD_BUTTON_TIMEOUT)
goto canceled; goto canceled;
else if (result == LCD_LEFT_BUTTON_CHOICE) 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) { for (; msg < msgend; ++ msg) {
char c = char(pgm_read_byte(msg)); char c = char(pgm_read_byte(msg));
if (c == '~') if (c == '\n') {
c = ' ';
else if (c == '\n') {
// Abort early if '\n' is encontered. // Abort early if '\n' is encontered.
// This character is used to force the following words to be printed on the next line. // This character is used to force the following words to be printed on the next line.
break; break;

2
lang/po/Firmware.pot
View File

@ -61,7 +61,7 @@ msgstr ""
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../Firmware/ultralcd.cpp:2826
msgid "Are left and right Z~carriages all up?" msgid "Are left and right Z-carriages all up?"
msgstr "" msgstr ""
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

8
lang/po/Firmware_cs.po
View File

@ -70,8 +70,8 @@ msgstr "Okoli"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../Firmware/ultralcd.cpp:2826
msgid "Are left and right Z~carriages all up?" msgid "Are left and right Z-carriages all up?"
msgstr "Dojely oba Z voziky k~hornimu dorazu?" msgstr "Dojely oba Z voziky k-hornimu dorazu?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7
#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 #: ../../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 " "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end "
"stoppers. Click when done." "stoppers. Click when done."
msgstr "" 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." " tlacitkem."
#. MSG_CALIBRATE_Z_AUTO c=20 r=2 #. 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 " "Calibrating Z. Rotate the knob to move the Z carriage up to the end "
"stoppers. Click when done." "stoppers. Click when done."
msgstr "" 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." "tlacitkem."
#. MSG_CALIBRATING_HOME c=20 #. MSG_CALIBRATING_HOME c=20

2
lang/po/Firmware_de.po
View File

@ -70,7 +70,7 @@ msgstr "Raumtemp."
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_es.po
View File

@ -70,7 +70,7 @@ msgstr "Ambiente"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Carros Z izq./der. estan arriba maximo?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

4
lang/po/Firmware_fr.po
View File

@ -70,8 +70,8 @@ msgstr "Ambiant"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../Firmware/ultralcd.cpp:2826
msgid "Are left and right Z~carriages all up?" msgid "Are left and right Z-carriages all up?"
msgstr "Z~carriages gauche + droite tout en haut?" msgstr "Z-carriages gauche + droite tout en haut?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7
#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 #: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191

6
lang/po/Firmware_hr.po
View File

@ -70,8 +70,8 @@ msgstr "Ambijent"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../Firmware/ultralcd.cpp:2826
msgid "Are left and right Z~carriages all up?" msgid "Are left and right Z-carriages all up?"
msgstr "Jesu lijevi i desni Z~nosaci podignuti?" msgstr "Jesu lijevi i desni Z-nosaci podignuti?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7
#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191 #: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4191
@ -877,7 +877,7 @@ msgid ""
"ready to print." "ready to print."
msgstr "" msgstr ""
"Bok, ja sam vas Original Prusa i3 printer. Vodit cu vas kroz kratak proces " "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." "printanje."
#. MSG_WIZARD_WELCOME c=20 r=7 #. MSG_WIZARD_WELCOME c=20 r=7

2
lang/po/Firmware_hu.po
View File

@ -70,7 +70,7 @@ msgstr "Kornyezet"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "A Z tengely a felso vegponton van?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_it.po
View File

@ -70,7 +70,7 @@ msgstr "Ambiente"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "I carrelli Z sin/des sono altezza max?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_nl.po
View File

@ -70,7 +70,7 @@ msgstr "Kamertemp."
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Zijn beide Z wagen heelemaal boven?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_no.po
View File

@ -70,7 +70,7 @@ msgstr "Omgivelse"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Er venstre og høyre Z-vogn helt oppe?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_pl.po
View File

@ -70,7 +70,7 @@ msgstr "Otoczenie"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Obydwa konce osi sa na szczycie?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_ro.po
View File

@ -70,7 +70,7 @@ msgstr "Ambiental"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Este axa Z aliniată sus?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_sk.po
View File

@ -70,7 +70,7 @@ msgstr "Okolie"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Došli oba Z vozíky k hornému dorazu?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7

2
lang/po/Firmware_sv.po
View File

@ -70,7 +70,7 @@ msgstr "Omgivande"
#. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3
#: ../../Firmware/ultralcd.cpp:2826 #: ../../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?" msgstr "Är båda Z-vagnarna helt uppe?"
#. MSG_SOUND_BLIND c=7 #. MSG_SOUND_BLIND c=7