Merge pull request MarlinFirmware#4085 from 3d-gussner/MK3_PFW-1445_p…

…re-release Revert MSG_BTN_MORE non-translated
drewmoseley · Mar 15, 2023 · 3243dfe · 3243dfe
2 parents 35eed18 + 8b49d24
commit 3243dfe
Show file tree

Hide file tree

Showing 17 changed files with 74 additions and 29 deletions.
diff --git 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_N1 = "\x06";
+static const char MSG_BTN_MORE[] PROGMEM_I1 = ISTR("\x06"); ////MSG_BTN_MORE c=8
 
 // 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
@@ -172,7 +172,7 @@ const char * PrusaErrorButtonTitle(uint8_t bi){
 }
 
 const char * PrusaErrorButtonMore(){
-    return MSG_BTN_MORE;
+    return _R(MSG_BTN_MORE);
 }
 
 struct ResetOnExit {

diff --git 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 : 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(){

diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
@@ -2430,6 +2430,12 @@ 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
@@ -2530,8 +2530,11 @@ msgstr ""
 "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi "
 "2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2558,8 +2558,11 @@ msgstr ""
 "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. "
 "Update auf Version 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2554,8 +2554,11 @@ 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."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2568,8 +2568,11 @@ msgstr ""
 "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour "
 "vers la version 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2547,8 +2547,11 @@ msgstr ""
 "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju "
 "2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2551,8 +2551,11 @@ msgstr ""
 "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissítés a "
 "2.1.9-es verzióra."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2552,8 +2552,11 @@ msgstr ""
 "La versione del firmware dell MMU non è compatibile con il firmware della "
 "stampante. Aggiornamento alla versione 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2556,8 +2556,11 @@ msgstr ""
 "De firmwareversie van de MMU is niet compatibel met de firmware van de "
 "printer. Update naar versie 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2529,8 +2529,11 @@ msgstr ""
 "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til "
 "versjon 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2548,8 +2548,11 @@ msgstr ""
 "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem "
 "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2552,8 +2552,11 @@ msgstr ""
 "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. "
 "Actualizați la versiunea 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2535,8 +2535,11 @@ msgstr ""
 "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na "
 "verziu 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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
@@ -2542,8 +2542,11 @@ msgstr ""
 "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till "
 "version 2.1.9."
 
-#~ msgid "⏬"
-#~ msgstr "⏬"
+#. 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"