From 7224854cf8086281112b1d25d0c386bd4028b8f8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 22 Dec 2016 18:23:42 -0800 Subject: [PATCH] Patch Spanish language to fix redundant defines --- Marlin/language_es.h | 45 +++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 4be67639b9..b174279d48 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -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 " " @@ -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" @@ -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" @@ -174,16 +178,19 @@ #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" @@ -200,13 +207,13 @@ #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..." + #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" + #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"