Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LCD output and add translations #8

Merged
merged 9 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Firmware/messages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced
const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."); ////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Continue?"); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3
const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8
const char MSG_MISSING_FILAMENT_CONTINUE[] PROGMEM_I1 = ISTR("There is no filament loaded. Continue?"); ////MSG_MISSING_FILAMENT_CONTINUE c=20 r=3;
const char MSG_MISSING_FILAMENT_CONTINUE[] PROGMEM_I1 = ISTR("There is no filament loaded. Continue?"); ////MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
const char MSG_MISSING_FILAMENT_CANCELLED[] PROGMEM_I1 = ISTR("There is no filament loaded. Print cancelled."); ////MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Continue?"); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2182,6 +2182,16 @@ msgid ""
"chapter)."
msgstr ""

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr ""

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr ""

#. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8
#: ../../Firmware/Marlin_main.cpp:1606 ../../Firmware/messages.cpp:47
msgid ""
Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2592,6 +2592,16 @@ msgstr "Tryska je horká! Počkejte na vychladnutí."
msgid "Nozzle changed?"
msgstr "Vyměnili jste trysku?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Není vloženo žádné vlákno. Pokračovat?"
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Není vloženo žádné vlákno. Tisk zrušen."
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -2620,6 +2620,16 @@ msgstr "Die Düse ist heiß! Auf Abkühlung warten."
msgid "Nozzle changed?"
msgstr "Düse gewechselt?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Kein Filament geladen. Fortfahren?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Kein Filament geladen. Druck abgebrochen."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_es.po
Original file line number Diff line number Diff line change
Expand Up @@ -2615,6 +2615,16 @@ msgstr "La boquilla está caliente! Espere a que se enfríe."
msgid "Nozzle changed?"
msgstr "Cambió la boquilla?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "No hay ningún filamento cargado. ¿Continuar?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "No hay ningún filamento cargado. Impresión cancelada."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Retira el fil. viejo y presiona el dial para comenzar a cargar el nuevo."
Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -2627,6 +2627,16 @@ msgstr "La buse est chaude! Attendre le refroidissement."
msgid "Nozzle changed?"
msgstr "La buse a été changée?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Il n'y a pas de filament chargé. Continuer?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Il n'y a pas de filament chargé. Impression annulée."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau."
Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -2609,6 +2609,16 @@ msgstr "Mlaznica je vruća! Pričekajte hlađenje."
msgid "Nozzle changed?"
msgstr "Mlaznica se promijenila?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Nema umetnute niti. Nastavite?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Nema umetnute niti. Print je otkazan."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -2614,6 +2614,16 @@ msgstr "A fúvóka forró! Várja meg a lehűlést."
msgid "Nozzle changed?"
msgstr "Fúvóka cserélve?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Nincs betöltött izzószál. Folytasasm?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Nincs betöltött izzószál. Nyomtatas megallitva."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_it.po
Original file line number Diff line number Diff line change
Expand Up @@ -2615,6 +2615,16 @@ msgstr "L'ugello è caldo! Attendere il raffreddamento."
msgid "Nozzle changed?"
msgstr "L'ugello è cambiato?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Non è caricato alcun filamento. Continuare?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Non è caricato alcun filamento. Stampa annullata."

3d-gussner marked this conversation as resolved.
Show resolved Hide resolved
#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -2617,6 +2617,16 @@ msgstr "Mondstuk is heet! Wacht op afkoeling."
msgid "Nozzle changed?"
msgstr "Mondstuk veranderd?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Geen filament geladen. Doorgaan?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Geen filament geladen. Afdrukken geannuleerd."
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr ""
#~ "Verwijder de oude filament en druk op de knop om nieuwe filament te laden."
Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_no.po
Original file line number Diff line number Diff line change
Expand Up @@ -2591,6 +2591,16 @@ msgstr "Dysen er varm! Vent på nedkjøling."
msgid "Nozzle changed?"
msgstr "Har du byttet dyse?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Det er ingen filament lastet. Fortsette?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Det er ingen filament lastet. Print avbrutt."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -2607,6 +2607,16 @@ msgstr "Dysza jest gorąca! Poczekaj na schłodzenie."
msgid "Nozzle changed?"
msgstr "Dysza została zmieniona?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Nie ma załadowanego filamentu. Kontynuować?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Nie ma załadowanego filamentu. Druk anulowany."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Wyciągnij poprzedni filament i naciśnij pokrętło aby załadować nowy."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_ro.po
Original file line number Diff line number Diff line change
Expand Up @@ -2616,6 +2616,16 @@ msgstr "Duza este fierbinte! Așteptați să se răcească."
msgid "Nozzle changed?"
msgstr "S-a schimbat duza?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Nu există filament încărcat. Continuați?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Nu există filament încărcat. Print anulat."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Scoateți fil. vechi și apăsați butonul pentru a încărca unul nou."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_sk.po
Original file line number Diff line number Diff line change
Expand Up @@ -2597,6 +2597,16 @@ msgstr "Tryska je horúca! Počkajte na vychladnutie."
msgid "Nozzle changed?"
msgstr "Vymenili ste trysku?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Nie je vložené žiadne vlákno. Pokračovať?"
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Nie je vložené žiadne vlákno. Tlač zrušená."
3d-gussner marked this conversation as resolved.
Show resolved Hide resolved

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Vyberte starý filament a stlačte tlačidlo pre zavedenie nového."

Expand Down
10 changes: 10 additions & 0 deletions lang/po/Firmware_sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -2604,6 +2604,16 @@ msgstr "Munstycket är varmt! Vänta på nedkylning."
msgid "Nozzle changed?"
msgstr "Har munstycket ändrats?"

#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
#: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:388
msgid "There is no filament loaded. Continue?"
msgstr "Det finns ingen filament laddad. Fortsätta?"

#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
#: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:389
msgid "There is no filament loaded. Print cancelled."
msgstr "Det finns ingen filament laddad. Utskriften avbröts."

#~ msgid "Remove old filament and press the knob to start loading new filament."
#~ msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt."

Expand Down