Skip to content

Rc #1

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.

Sign up for GitHub

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

Open
JoelBrenstrum wants to merge 11 commits into
base: RC
Choose a base branch
from
Open

Rc #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2b780b
Ignore homing button when SD printing
thinkyhead Dec 6, 2016
f5c1597
Update language_tr.h
Dec 6, 2016
8d394ee
Update language_tr_utf8.h
Dec 6, 2016
e3cbd85
Update Polish language
Dec 6, 2016
6e15170
Optimize findMissingTranslations.sh
thinkyhead Dec 7, 2016
2a76951
Save space by not defining unused filament change message lines
thinkyhead Dec 7, 2016
c00ddc1
Remove filament-change empty lines from languages
thinkyhead Dec 7, 2016
60a6eda
Patch some planner compile errors
thinkyhead Dec 7, 2016
90c6aa9
Fix Mesh without Fade Height
MagoKimbra Dec 7, 2016
848287b
Patch Spanish language to fix redundant defines
thinkyhead Dec 23, 2016
89731ca
Update README for 1.0.2-2
thinkyhead Apr 2, 2017
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 Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9972,7 +9972,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
// ---------------------------------------------------------
static int homeDebounceCount = 0; // poor man's debouncing count
const int HOME_DEBOUNCE_DELAY = 2500;
if (!READ(HOME_PIN)) {
if (!IS_SD_PRINTING && !READ(HOME_PIN)) {
if (!homeDebounceCount) {
enqueue_and_echo_commands_P(PSTR("G28"));
LCD_MESSAGEPGM(MSG_AUTO_HOME);
Expand Down
8 changes: 4 additions & 4 deletions Marlin/language_bg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,30 +210,30 @@
#define MSG_DRIVE_STRENGTH "Drive Strength"
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write"

#define MSG_FILAMENT_CHANGE_HEADER "CHANGE FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGE OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extrude more"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"

#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"
Expand Down
3 changes: 3 additions & 0 deletions Marlin/language_cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CO DAL?"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Jeste vytlacit"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Obnovit tisk"

#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Cekejte prosim"
#define MSG_FILAMENT_CHANGE_INIT_2 "na zahajeni"
#define MSG_FILAMENT_CHANGE_INIT_3 "vymeny filamentu"
Expand All @@ -234,6 +236,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "na pokracovani"
#define MSG_FILAMENT_CHANGE_RESUME_3 "tisku"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Cekejte..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Vysouvani..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Vlozte, kliknete"
Expand Down
1 change: 1 addition & 0 deletions Marlin/language_da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
#define MSG_DRIVE_STRENGTH "Driv Styrke"
#define MSG_DAC_PERCENT "Driv %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM Skriv"

#define MSG_FILAMENT_CHANGE_HEADER "SKIFT FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "Skift muligheder:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruder mere"
Expand Down
2 changes: 2 additions & 0 deletions Marlin/language_de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Drucke weiter"

#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Warte auf den"
#define MSG_FILAMENT_CHANGE_INIT_2 "Start des "
#define MSG_FILAMENT_CHANGE_INIT_3 "Filamentwechsels"
Expand All @@ -235,6 +236,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "Fortsetzung des"
#define MSG_FILAMENT_CHANGE_RESUME_3 "Druckes"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Bitte warten..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Auswerfen..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Laden und Klick"
Expand Down
46 changes: 22 additions & 24 deletions Marlin/language_el.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,31 +198,29 @@
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"

#if LCD_HEIGHT >= 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#else // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Loading..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extruding..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Resuming..."
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Loading..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extruding..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Resuming..."
#endif

#endif // LANGUAGE_EL_H
33 changes: 5 additions & 28 deletions Marlin/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,61 +559,38 @@
#ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#endif

//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
//
#if LCD_HEIGHT >= 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_2
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_3
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_1
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_2
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_3
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_1
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_2
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_3
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_1
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_2
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_3
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#endif
#else // LCD_HEIGHT < 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
Expand Down
61 changes: 38 additions & 23 deletions Marlin/language_es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#define MSG_PREHEAT_1 "Precalentar PLA"
#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 "Todo"
#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1"Plataforma"
#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 "Plataforma"
#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "Config"
#define MSG_PREHEAT_2 "Precalentar ABS"
#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
Expand Down Expand Up @@ -81,9 +81,9 @@
#define MSG_FAN_SPEED "Ventilador"
#define MSG_FLOW "Flujo"
#define MSG_CONTROL "Control"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP "Temperatura Auto."
#define MSG_ON "Encender"
#define MSG_OFF "Apagar"
Expand All @@ -106,6 +106,10 @@
#define MSG_YSTEPS "Y pasos/mm"
#define MSG_ZSTEPS "Z pasos/mm"
#define MSG_ESTEPS "E pasos/mm"
#define MSG_E1STEPS "E1 pasos/mm"
#define MSG_E2STEPS "E2 pasos/mm"
#define MSG_E3STEPS "E3 pasos/mm"
#define MSG_E4STEPS "E4 pasos/mm"
#define MSG_TEMPERATURE "Temperatura"
#define MSG_MOTION "Movimiento"
#define MSG_VOLUMETRIC "Filamento"
Expand Down Expand Up @@ -174,40 +178,51 @@
#define MSG_INFO_EXTRUDERS "Extrusores"
#define MSG_INFO_BAUDRATE "Baudios"
#define MSG_INFO_PROTOCOL "Protocolo"
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
#define MSG_INFO_PRINT_COUNT "Impresiones"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_LONGEST "Mas larga"
#define MSG_INFO_PRINT_FILAMENT "Extrusion"
#if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
#else
#define MSG_INFO_PRINT_COUNT "Impresiones"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_LONGEST "Mas larga"
#define MSG_INFO_PRINT_FILAMENT "Extrusion"
#endif
#define MSG_INFO_MIN_TEMP "Temperatura minima"
#define MSG_INFO_MAX_TEMP "Temperatura maxima"
#define MSG_INFO_PSU "Fuente de poder"

#define MSG_FILAMENT_CHANGE_HEADER "Cambiar Filamento"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "Opciones de cambio:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruir mas"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resumir imp."

#define MSG_FILAMENT_CHANGE_INIT_1 "Esperando iniciar"
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filamento expulsado"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""

#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
#define MSG_FILAMENT_CHANGE_INSERT_2 "y presione el boton"
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."

#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
#endif // LCD_HEIGHT < 4

#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filamento expulsado"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_LOAD_2 "Cargar filamento"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "Extruir filamento"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Esperando imp."
#define MSG_FILAMENT_CHANGE_RESUME_2 "para resumir"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""

#endif // LANGUAGE_ES_H
47 changes: 23 additions & 24 deletions Marlin/language_fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,37 +208,36 @@
#define MSG_DRIVE_STRENGTH "Puiss. moteur "
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM sauv."

#define MSG_FILAMENT_CHANGE_HEADER "CHANGER FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGER OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "+ extrusion"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Reprendre impr."

#if LCD_HEIGHT >= 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Attente Demarrage"
#define MSG_FILAMENT_CHANGE_INIT_2 "du filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "changer"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "decharger filament"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "inserer filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "et app. bouton"
#define MSG_FILAMENT_CHANGE_INSERT_3 "pour continuer..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_LOAD_2 "charger filament"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "attente de"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "extrusion fil."
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "attente impression"
#define MSG_FILAMENT_CHANGE_RESUME_2 "pour reprendre"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Attente Demarrage"
#define MSG_FILAMENT_CHANGE_INIT_2 "du filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "changer"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "decharger filament"
#define MSG_FILAMENT_CHANGE_INSERT_1 "inserer filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "et app. bouton"
#define MSG_FILAMENT_CHANGE_INSERT_3 "pour continuer..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_LOAD_2 "charger filament"
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "attente de"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "extrusion fil."
#define MSG_FILAMENT_CHANGE_RESUME_1 "attente impression"
#define MSG_FILAMENT_CHANGE_RESUME_2 "pour reprendre"
#else // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Patientez..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejection..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserer et click"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Chargement..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extrusion..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Reprise..."
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Patientez..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejection..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserer et click"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Chargement..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extrusion..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Reprise..."
#endif // LCD_HEIGHT < 4

#endif // LANGUAGE_FR_H
4 changes: 4 additions & 0 deletions Marlin/language_gl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,14 @@
#define MSG_DRIVE_STRENGTH "Potencia motor"
#define MSG_DAC_PERCENT "Motor %"
#define MSG_DAC_EEPROM_WRITE "Garda DAC EEPROM"

#define MSG_FILAMENT_CHANGE_HEADER "TROCO FILAMENTO"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "OPCIONS TROCO:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruir mais"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Segue traballo"

#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Agarde para"
#define MSG_FILAMENT_CHANGE_INIT_2 "iniciar troco"
#define MSG_FILAMENT_CHANGE_INIT_3 "de filamento"
Expand All @@ -230,6 +233,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "seguir co"
#define MSG_FILAMENT_CHANGE_RESUME_3 "traballo"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Agarde..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Descargando..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza e click"
Expand Down
Loading