From e2b58d8724cd894c51078b796d936d0bede6e498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Mar 2023 16:50:42 +0000 Subject: [PATCH 1/2] Don't translate the more button --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_error_converter.cpp | 2 +- Firmware/mmu2_reporting.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index d88819feb..44a205666 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -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_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_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8 +static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; // Used to parse the buttons from Btns(). static const char * const btnOperation[] PROGMEM = { diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 3673f7d90..0f9975026 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){ } const char * PrusaErrorButtonMore(){ - return _R(MSG_BTN_MORE); + return MSG_BTN_MORE; } struct ResetOnExit { diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index e2d537939..87615b56e 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -77,7 +77,7 @@ static void ReportErrorHookStaticRender(uint8_t ei) { ReportErrorHookSensorLineRender(); // 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 : _T(PrusaErrorButtonMore())); + lcd_show_choices_prompt_P(two_choices ? LCD_LEFT_BUTTON_CHOICE : LCD_MIDDLE_BUTTON_CHOICE, _T(PrusaErrorButtonTitle(button_op_middle)), two_choices ? PrusaErrorButtonMore() : _T(PrusaErrorButtonTitle(button_op_right)), two_choices ? 18 : 9, two_choices ? nullptr : PrusaErrorButtonMore()); } void ReportErrorHookSensorLineRender(){ From 0dbae6b6091f69adacb271e2eb6be91079023a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 19 Mar 2023 16:52:40 +0000 Subject: [PATCH 2/2] Remove MSG_BTN_MORE from translation files --- lang/po/Firmware.pot | 6 ------ lang/po/Firmware_cs.po | 6 ------ lang/po/Firmware_de.po | 6 ------ lang/po/Firmware_es.po | 6 ------ lang/po/Firmware_fr.po | 6 ------ lang/po/Firmware_hr.po | 6 ------ lang/po/Firmware_hu.po | 6 ------ lang/po/Firmware_it.po | 6 ------ lang/po/Firmware_nl.po | 6 ------ lang/po/Firmware_no.po | 6 ------ lang/po/Firmware_pl.po | 6 ------ lang/po/Firmware_ro.po | 6 ------ lang/po/Firmware_sk.po | 6 ------ lang/po/Firmware_sv.po | 6 ------ 14 files changed, 84 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 2d7397aba..f43412179 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -2430,12 +2430,6 @@ msgstr "" msgid "unknown state" msgstr "" -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "" - #. MSG_REFRESH c=18 #: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 #: ../../Firmware/ultralcd.cpp:5946 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index b1bb2acdd..ba93df4b1 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2530,12 +2530,6 @@ msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 20d051d30..da3a4330f 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2558,12 +2558,6 @@ msgstr "" "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Update auf Version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 4cf573a06..2ab0eb212 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2554,12 +2554,6 @@ msgstr "" "La versión de firmware de la MMU es incompatible con el FW de la impresora. " "Actualizar a la versión 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 5d07bd843..335b2bb29 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2568,12 +2568,6 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 06c1a473c..691d243e2 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2547,12 +2547,6 @@ msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index b167556ef..2b635ace7 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2551,12 +2551,6 @@ msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a " "2.1.9-es verzióra." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index c3ea06a54..e7d6784ba 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2552,12 +2552,6 @@ msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index d10c04a6e..50aebbd28 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2556,12 +2556,6 @@ msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index c22c4144f..90a5469c3 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2529,12 +2529,6 @@ msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index aa0ffbd91..d155d39ea 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2548,12 +2548,6 @@ msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 2dacda832..a6b941960 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2552,12 +2552,6 @@ msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 12c26c5fb..90f1166f4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2535,12 +2535,6 @@ msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 10a81b9fd..ca0d5668a 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2542,12 +2542,6 @@ msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." -#. MSG_BTN_MORE c=8 -#: ../../Firmware/mmu2/errors_list.h:335 -#: ../../Firmware/mmu2_error_converter.cpp:175 -msgid "⏬" -msgstr "⏬" - #~ msgid "Reset MMU" #~ msgstr "Reset MMU"