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

revert BTN_MORE non-translated

This commit is contained in:
3d-gussner 2023-03-15 07:03:41 +01:00
parent 00309f42c3
commit 8b49d241d2
17 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/mmu2/errors_list.h
View File

@ -332,7 +332,7 @@ static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("RstMMU"); ////MSG_BTN
static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8
static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8
static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8
static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8
// Used to parse the buttons from Btns(). // Used to parse the buttons from Btns().
static const char * const btnOperation[] PROGMEM = { static const char * const btnOperation[] PROGMEM = {

2
Firmware/mmu2_error_converter.cpp
View File

@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){
} }
const char * PrusaErrorButtonMore(){ const char * PrusaErrorButtonMore(){
return MSG_BTN_MORE; return _R(MSG_BTN_MORE);
} }
struct ResetOnExit { struct ResetOnExit {

2
Firmware/mmu2_reporting.cpp
View File

@ -77,7 +77,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) {
ReportErrorHookSensorLineRender(); ReportErrorHookSensorLineRender();
// Render the choices // Render the choices
lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : PrusaErrorButtonMore()); lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), _T(two_choices ? PrusaErrorButtonMore() : PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : _T(PrusaErrorButtonMore()));
} }
void ReportErrorHookSensorLineRender(){ void ReportErrorHookSensorLineRender(){

6
lang/po/Firmware.pot
View File

@ -2430,6 +2430,12 @@ msgstr ""
msgid "unknown state" msgid "unknown state"
msgstr "" msgstr ""
#. MSG_BTN_MORE c=8
#: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr ""
#. MSG_REFRESH c=18 #. MSG_REFRESH c=18
#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943
#: ../../Firmware/ultralcd.cpp:5946 #: ../../Firmware/ultralcd.cpp:5946

7
lang/po/Firmware_cs.po
View File

@ -2530,8 +2530,11 @@ msgstr ""
"Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi "
"2.1.9." "2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Eject filament" #~ msgid "Eject filament"
#~ msgstr "Vysunout fil." #~ msgstr "Vysunout fil."

7
lang/po/Firmware_de.po
View File

@ -2558,8 +2558,11 @@ msgstr ""
"Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. "
"Update auf Version 2.1.9." "Update auf Version 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Eject filament" #~ msgid "Eject filament"
#~ msgstr "Filamentauswurf" #~ msgstr "Filamentauswurf"

7
lang/po/Firmware_es.po
View File

@ -2554,8 +2554,11 @@ msgstr ""
"La versión de firmware de la MMU es incompatible con el FW de la impresora. " "La versión de firmware de la MMU es incompatible con el FW de la impresora. "
"Actualizar a la versión 2.1.9." "Actualizar a la versión 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_fr.po
View File

@ -2568,8 +2568,11 @@ msgstr ""
"La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour "
"vers la version 2.1.9." "vers la version 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reini MMU" #~ msgstr "Reini MMU"

7
lang/po/Firmware_hr.po
View File

@ -2547,8 +2547,11 @@ msgstr ""
"Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju "
"2.1.9." "2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_hu.po
View File

@ -2551,8 +2551,11 @@ msgstr ""
"Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a "
"2.1.9-es verzióra." "2.1.9-es verzióra."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "MMUreszet" #~ msgstr "MMUreszet"

7
lang/po/Firmware_it.po
View File

@ -2552,8 +2552,11 @@ msgstr ""
"La versione del firmware dell MMU non è compatibile con il firmware della " "La versione del firmware dell MMU non è compatibile con il firmware della "
"stampante. Aggiornamento alla versione 2.1.9." "stampante. Aggiornamento alla versione 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_nl.po
View File

@ -2556,8 +2556,11 @@ msgstr ""
"De firmwareversie van de MMU is niet compatibel met de firmware van de " "De firmwareversie van de MMU is niet compatibel met de firmware van de "
"printer. Update naar versie 2.1.9." "printer. Update naar versie 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_no.po
View File

@ -2529,8 +2529,11 @@ msgstr ""
"MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til "
"versjon 2.1.9." "versjon 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_pl.po
View File

@ -2548,8 +2548,11 @@ msgstr ""
"Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem "
"sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_ro.po
View File

@ -2552,8 +2552,11 @@ msgstr ""
"Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. "
"Actualizați la versiunea 2.1.9." "Actualizați la versiunea 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_sk.po
View File

@ -2535,8 +2535,11 @@ msgstr ""
"Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na "
"verziu 2.1.9." "verziu 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"

7
lang/po/Firmware_sv.po
View File

@ -2542,8 +2542,11 @@ msgstr ""
"MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till "
"version 2.1.9." "version 2.1.9."
#~ msgid "⏬" #. MSG_BTN_MORE c=8
#~ msgstr "⏬" #: ../../Firmware/mmu2/errors_list.h:335
#: ../../Firmware/mmu2_error_converter.cpp:175
msgid "⏬"
msgstr "⏬"
#~ msgid "Reset MMU" #~ msgid "Reset MMU"
#~ msgstr "Reset MMU" #~ msgstr "Reset MMU"