Skip to content

Commit 7224854

Browse files
authored
Patch Spanish language to fix redundant defines
1 parent 7bea5e5 commit 7224854

File tree

1 file changed

+26
-19
lines changed

1 file changed

+26
-19
lines changed

Marlin/language_es.h

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define MSG_PREHEAT_1 "Precalentar PLA"
5454
#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
5555
#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 "Todo"
56-
#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1"Plataforma"
56+
#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 "Plataforma"
5757
#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "Config"
5858
#define MSG_PREHEAT_2 "Precalentar ABS"
5959
#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
@@ -81,9 +81,9 @@
8181
#define MSG_FAN_SPEED "Ventilador"
8282
#define MSG_FLOW "Flujo"
8383
#define MSG_CONTROL "Control"
84-
#define MSG_MIN LCD_STR_THERMOMETER " Min"
85-
#define MSG_MAX LCD_STR_THERMOMETER " Max"
86-
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
84+
#define MSG_MIN " " LCD_STR_THERMOMETER " Min"
85+
#define MSG_MAX " " LCD_STR_THERMOMETER " Max"
86+
#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact"
8787
#define MSG_AUTOTEMP "Temperatura Auto."
8888
#define MSG_ON "Encender"
8989
#define MSG_OFF "Apagar"
@@ -106,6 +106,10 @@
106106
#define MSG_YSTEPS "Y pasos/mm"
107107
#define MSG_ZSTEPS "Z pasos/mm"
108108
#define MSG_ESTEPS "E pasos/mm"
109+
#define MSG_E1STEPS "E1 pasos/mm"
110+
#define MSG_E2STEPS "E2 pasos/mm"
111+
#define MSG_E3STEPS "E3 pasos/mm"
112+
#define MSG_E4STEPS "E4 pasos/mm"
109113
#define MSG_TEMPERATURE "Temperatura"
110114
#define MSG_MOTION "Movimiento"
111115
#define MSG_VOLUMETRIC "Filamento"
@@ -174,16 +178,19 @@
174178
#define MSG_INFO_EXTRUDERS "Extrusores"
175179
#define MSG_INFO_BAUDRATE "Baudios"
176180
#define MSG_INFO_PROTOCOL "Protocolo"
177-
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
178-
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
179-
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
180-
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
181-
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
182-
#define MSG_INFO_PRINT_COUNT "Impresiones"
183-
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
184-
#define MSG_INFO_PRINT_TIME "Total"
185-
#define MSG_INFO_PRINT_LONGEST "Mas larga"
186-
#define MSG_INFO_PRINT_FILAMENT "Extrusion"
181+
#if LCD_WIDTH > 19
182+
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
183+
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
184+
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
185+
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
186+
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
187+
#else
188+
#define MSG_INFO_PRINT_COUNT "Impresiones"
189+
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
190+
#define MSG_INFO_PRINT_TIME "Total"
191+
#define MSG_INFO_PRINT_LONGEST "Mas larga"
192+
#define MSG_INFO_PRINT_FILAMENT "Extrusion"
193+
#endif
187194
#define MSG_INFO_MIN_TEMP "Temperatura minima"
188195
#define MSG_INFO_MAX_TEMP "Temperatura maxima"
189196
#define MSG_INFO_PSU "Fuente de poder"
@@ -200,13 +207,13 @@
200207

201208
#if LCD_HEIGHT >= 4
202209
// Up to 3 lines allowed
203-
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
204-
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
205-
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
210+
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
211+
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
212+
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
206213
#else // LCD_HEIGHT < 4
207214
// Up to 2 lines allowed
208-
#define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar"
209-
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
215+
#define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar"
216+
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
210217
#endif // LCD_HEIGHT < 4
211218

212219
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"

0 commit comments

Comments
 (0)