From 3ea620c27ae4ec61afda920ef65179eadd223552 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 16 Dec 2024 11:47:56 +0100 Subject: [PATCH] Eject translations in German and Dutch not shorten as it fits now the multiple choice. --- Firmware/messages.cpp | 2 +- Firmware/mmu2/errors_list.h | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 4 ++-- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 1c5a31c30..9fe3bc897 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -18,7 +18,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////MSG_BED_HEATI const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////MSG_BELT_STATUS c=18 -const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=8 +const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=9 const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=10 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////MSG_CALIBRATE_Z_AUTO c=20 r=2 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////MSG_CARD_MENU c=18 diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 8d64a00d2..9a88da1f3 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -355,7 +355,7 @@ static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY static const char MSG_BTN_RESET_MMU[] PROGMEM_I1 = ISTR("ResetMMU"); ////MSG_BTN_RESET_MMU c=8 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_LOAD[] PROGMEM_I1 = ISTR("Load"); ////MSG_BTN_LOAD c=8 -//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=8 +//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=9 //static const char MSG_BTN_TUNE_MMU[] PROGMEM_I1 = ISTR("Tune"); //Reuse MSG_TUNE 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 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index baf9a8d4a..7bf6133db 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2266,7 +2266,7 @@ void show_preheat_nozzle_warning() void lcd_load_filament_color_check() { - // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=8 with the selectors and spaces between + // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=9 with the selectors and spaces between // exceeds the LCD width. // 01234567890123456789 // >yyyy >nnnn >eeeeeeee @@ -2275,7 +2275,7 @@ void lcd_load_filament_color_check() // Examples: // German // 01234567890123456789 - // >Ja >Nein >Auswerf. + // >Ja >Nein >Auswerfen // Hungarian // 01234567890123456789 // >Igen >Nem >Kiadás diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 7ef7dc553..36458f974 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -470,7 +470,7 @@ msgstr "" msgid "ERROR:" msgstr "" -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 99c7b4478..d5df331dd 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2518,7 +2518,7 @@ msgstr "NEZNÁMÁ CHYBA" msgid "Unexpected error occurred." msgstr "Došlo k neočekávané chybě." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 52b3a6f20..a705b02b8 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2544,11 +2544,11 @@ msgstr "UNBEKANNTER FEHLER" msgid "Unexpected error occurred." msgstr "Ein unerwarteter Fehler ist aufgetreten." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" -msgstr "Auswerf." +msgstr "Auswerfen" #. MSG_TITLE_FILAMENT_CHANGE c=20 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 6eec2af07..7c77deb96 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2540,7 +2540,7 @@ msgstr "ERROR DESCONOCIDO" msgid "Unexpected error occurred." msgstr "Ocurrió un error inesperado." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b05ee5932..108c0ce0d 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2553,7 +2553,7 @@ msgstr "ERREUR INCONNUE" msgid "Unexpected error occurred." msgstr "Une erreur inattendue s'est produite." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index dea20725d..849680974 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2535,7 +2535,7 @@ msgstr "NEPOZNATA POGREŠKA" msgid "Unexpected error occurred." msgstr "Došlo je do neočekivane pogreške." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6a43dbb6f..34e5934bf 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2541,7 +2541,7 @@ msgstr "ISMERETLEN HIBA" msgid "Unexpected error occurred." msgstr "Váratlan hiba történt." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 093c82b9d..02d11664c 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2540,7 +2540,7 @@ msgstr "ERRORE SCONOSCIUTO" msgid "Unexpected error occurred." msgstr "Si è verificato un errore imprevisto." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index e587951fa..dfd41b1b8 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2543,11 +2543,11 @@ msgstr "ONBEKENDE FOUT" msgid "Unexpected error occurred." msgstr "Er is een onverwachte fout opgetreden." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" -msgstr "Uitwerp." +msgstr "Uitwerpen" #. MSG_TITLE_FILAMENT_CHANGE c=20 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index a3aceb78c..0c47128b7 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2517,7 +2517,7 @@ msgstr "UKJENT FEIL" msgid "Unexpected error occurred." msgstr "Det oppstod en uventet feil." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 251e686d0..7819e10a2 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2533,7 +2533,7 @@ msgstr "NIEZNANY BŁĄD" msgid "Unexpected error occurred." msgstr "Pojawił się nieoczekiwany błąd." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 03eaf9002..5e8666830 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2541,7 +2541,7 @@ msgstr "EROARE NECUNOSCUTĂ" msgid "Unexpected error occurred." msgstr "A apărut o eroare neașteptată." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index be54da826..e8c484ac4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2523,7 +2523,7 @@ msgstr "NEZNÁMA CHYBA" msgid "Unexpected error occurred." msgstr "Vyskytla sa neočakávaná chyba." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 40d9a6cd4..8b05e343f 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2530,7 +2530,7 @@ msgstr "OKÄNT FEL" msgid "Unexpected error occurred." msgstr "Ett oväntat fel inträffade." -#. MSG_EJECT c=8 +#. MSG_EJECT c=9 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279 msgid "Eject"