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

Fix issue #4424 

Fix rebase
This commit is contained in:
3d-gussner 2023-12-19 09:16:48 +01:00
parent 3fa03ec1fb
commit feebac54fc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/ultralcd.cpp
View File

@ -2139,12 +2139,12 @@ void lcd_wait_interact() {
lcd_clear(); lcd_clear();
lcd_puts_at_P(0, 1, _T(MSG_INSERT_FILAMENT)); lcd_puts_at_P(0, 0, _T(MSG_INSERT_FILAMENT));
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
if (!fsensor.getAutoLoadEnabled()) if (!fsensor.getAutoLoadEnabled())
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
{ {
lcd_puts_at_P(0, 2, _T(MSG_PRESS)); lcd_puts_at_P(0, 1, _T(MSG_PRESS));
} }
} }

2
lang/po/Firmware_fr.po
View File

@ -2442,7 +2442,7 @@ msgstr "Offset point [0;0]"
#. MSG_PRESS c=20 r=2 #. MSG_PRESS c=20 r=2
#: ../../Firmware/messages.cpp:239 ../../Firmware/ultralcd.cpp:2147 #: ../../Firmware/messages.cpp:239 ../../Firmware/ultralcd.cpp:2147
msgid "and press the knob" msgid "and press the knob"
msgstr "et appuyez sur le bouton" msgstr "et appuyez\nsur le bouton"
#. MSG_TO_LOAD_FIL c=20 #. MSG_TO_LOAD_FIL c=20
#: ../../Firmware/messages.cpp:232 ../../Firmware/ultralcd.cpp:1807 #: ../../Firmware/messages.cpp:232 ../../Firmware/ultralcd.cpp:1807

2
lang/po/Firmware_hu.po
View File

@ -2430,7 +2430,7 @@ msgstr "[0;0] pont offszet"
#. MSG_PRESS c=20 r=2 #. MSG_PRESS c=20 r=2
#: ../../Firmware/messages.cpp:239 ../../Firmware/ultralcd.cpp:2147 #: ../../Firmware/messages.cpp:239 ../../Firmware/ultralcd.cpp:2147
msgid "and press the knob" msgid "and press the knob"
msgstr "es nyomd meg a gombot" msgstr "es nyomd meg\na gombot"
#. MSG_TO_LOAD_FIL c=20 #. MSG_TO_LOAD_FIL c=20
#: ../../Firmware/messages.cpp:232 ../../Firmware/ultralcd.cpp:1807 #: ../../Firmware/messages.cpp:232 ../../Firmware/ultralcd.cpp:1807