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 7 commits
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/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3376,7 +3376,7 @@ static void mmu_M600_load_filament(bool automatic) {
slot = SpoolJoin::spooljoin.nextSlot();
} else {
// Only ask for the slot if automatic/SpoolJoin is off
slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);
}

setTargetHotend(saved_extruder_temperature);
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Tcodes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void TCodes(char *const strchr_pointer, const uint8_t codeValue) {
} else if (strchr_pointer[index] == 'x' || strchr_pointer[index] == '?'){
// load to extruder gears; if mmu is not present do nothing
if (MMU2::mmu2.Enabled()) {
MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)));
MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT));
}
} else if (strchr_pointer[index] == 'c'){
// load from extruder gears to nozzle (nozzle should be preheated)
Expand Down
4 changes: 2 additions & 2 deletions Firmware/messages.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////MSG_ERROR c=10
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////MSG_EXTRUDER c=17
const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK c=13
const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////MSG_FIL_RUNOUTS c=15
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////MSG_FILAMENT c=17
const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14
const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15
const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15
Expand Down Expand Up @@ -155,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 Expand Up @@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [] PROGMEM_I1 = ISTR(PRINTER_NAME " firmwa
//not internationalized messages
const char MSG_SPOOL_JOIN[] PROGMEM_N1 = "SpoolJoin"; ////MSG_SPOOL_JOIN c=13
const char MSG_FIRMWARE[] PROGMEM_N1 = "Firmware"; ////MSG_FIRMWARE c=8
const char MSG_FILAMENT[] PROGMEM_N1 = "Filament"; ////MSG_FILAMENT c=8
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = "FlashAir"; ////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
const char MSG_PINDA[] PROGMEM_N1 = "PINDA"; ////MSG_PINDA c=5
const char MSG_WELCOME[] PROGMEM_N1 = WELCOME_MSG;
Expand Down
2 changes: 1 addition & 1 deletion Firmware/messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ extern const char MSG_ERROR[];
extern const char MSG_EXTRUDER[];
extern const char MSG_FANS_CHECK[];
extern const char MSG_FIL_RUNOUTS[];
extern const char MSG_FILAMENT[];
extern const char MSG_FAN_SPEED[];
extern const char MSG_HOTEND_FAN_SPEED[];
extern const char MSG_PRINT_FAN_SPEED[];
Expand Down Expand Up @@ -380,6 +379,7 @@ extern const char MSG_FW_MK3_DETECTED [];
//not internationalized messages
extern const char MSG_SPOOL_JOIN[];
extern const char MSG_FIRMWARE[];
extern const char MSG_FILAMENT[];
extern const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[];
extern const char MSG_PINDA[];
extern const char MSG_WELCOME[];
Expand Down
4 changes: 2 additions & 2 deletions Firmware/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3620,7 +3620,7 @@ void lcd_v2_calibration() {
if (MMU2::mmu2.Enabled()) {
const uint8_t filament = choose_menu_P(
_T(MSG_SELECT_FILAMENT),
_T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
MSG_FILAMENT,(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
if (filament < MMU_FILAMENT_COUNT) {
lay1cal_filament = filament;
} else {
Expand Down Expand Up @@ -6787,7 +6787,7 @@ static bool lcd_selftest_fsensor(void)
static bool selftest_irsensor()
{
// Ask user which slot to load filament from
uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), MSG_FILAMENT);

// Render self-test screen
lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0);
Expand Down
17 changes: 10 additions & 7 deletions lang/po/Firmware.pot
Original file line number Diff line number Diff line change
Expand Up @@ -674,13 +674,6 @@ msgstr ""
msgid "Fil. sensor"
msgstr ""

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr ""

#. MSG_DESC_UNLOAD_MANUALLY c=20 r=8
#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:339
msgid ""
Expand Down Expand Up @@ -2189,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
17 changes: 10 additions & 7 deletions lang/po/Firmware_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -680,13 +680,6 @@ msgstr "Výpadky filam."
msgid "Fil. sensor"
msgstr "Fil. senzor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2599,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žen filament. Pokračovat?"

#. 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žen filament. Tisk zrušen."

#~ 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
17 changes: 10 additions & 7 deletions lang/po/Firmware_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -682,13 +682,6 @@ msgstr "Fil. Mängel"
msgid "Fil. sensor"
msgstr "Fil. Sensor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2627,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
17 changes: 10 additions & 7 deletions lang/po/Firmware_es.po
Original file line number Diff line number Diff line change
Expand Up @@ -686,13 +686,6 @@ msgstr "Fil. acabado"
msgid "Fil. sensor"
msgstr "Sensor Fil."

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filamento"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2622,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
17 changes: 10 additions & 7 deletions lang/po/Firmware_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -690,13 +690,6 @@ msgstr "Fins filament"
msgid "Fil. sensor"
msgstr "Capteur Fil."

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2634,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
17 changes: 10 additions & 7 deletions lang/po/Firmware_hr.po
Original file line number Diff line number Diff line change
Expand Up @@ -684,13 +684,6 @@ msgstr "Bez filmaneta"
msgid "Fil. sensor"
msgstr "Fil. senzor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2616,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
17 changes: 10 additions & 7 deletions lang/po/Firmware_hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -687,13 +687,6 @@ msgstr "Fil. kifutasok"
msgid "Fil. sensor"
msgstr "Fil. szenzor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2621,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 befűzve filament. Folytassam?"

#. 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 befűzve filament. Nyomtatás megállítva."

#~ 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
17 changes: 10 additions & 7 deletions lang/po/Firmware_it.po
Original file line number Diff line number Diff line change
Expand Up @@ -688,13 +688,6 @@ msgstr "Fil. esauriti"
msgid "Fil. sensor"
msgstr "Sensore fil."

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filamento"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2622,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 "Nessun filamento caricato. 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 "Nessun filamento caricato. 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
19 changes: 11 additions & 8 deletions lang/po/Firmware_nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -689,13 +689,6 @@ msgstr "Fil. fouten"
msgid "Fil. sensor"
msgstr "Fil. sensor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -1709,7 +1702,7 @@ msgid ""
" Print cancelled."
msgstr ""
"De diameter van de tuit van de printer verschilt van de G-code. Controleer "
"de waarde in de instellingen. Afdrukken geannuleerd."
"de waarde in de instellingen. Printen geannuleerd."

#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
Expand Down Expand Up @@ -2624,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. Printen geannuleerd."

#~ 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
17 changes: 10 additions & 7 deletions lang/po/Firmware_no.po
Original file line number Diff line number Diff line change
Expand Up @@ -687,13 +687,6 @@ msgstr "Tomt filament"
msgid "Fil. sensor"
msgstr "Fil. Sensor"

#. MSG_FILAMENT c=17
#: ../../Firmware/Marlin_main.cpp:3453 ../../Firmware/Tcodes.cpp:34
#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:3613
#: ../../Firmware/ultralcd.cpp:6822
msgid "Filament"
msgstr "Filament"

#. MSG_FILAMENT_CLEAN c=20 r=3
#: ../../Firmware/messages.cpp:41 ../../Firmware/ultralcd.cpp:2261
#: ../../Firmware/ultralcd.cpp:2265
Expand Down Expand Up @@ -2598,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
Loading