Skip to content

Commit

Permalink
Eject translations in German and Dutch not shorten as it fits now the…
Browse files Browse the repository at this point in the history
… multiple choice.
  • Loading branch information
3d-gussner committed Dec 16, 2024
1 parent 7e3d1c2 commit 4b0deb3
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Firmware/messages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Firmware/mmu2/errors_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Firmware/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions lang/po/Firmware_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_es.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_it.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions lang/po/Firmware_nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_no.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_ro.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_sk.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lang/po/Firmware_sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 4b0deb3

Please sign in to comment.