andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #5492 from thinkyhead/rc_fix_language_es 

Fix multiple definitions of message macros in the language-es.h
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
b67f8cb499 1cdffdede7
commit
1fd8185d37
1 changed files with 18 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      Marlin/language_es.h

33
Marlin/language_es.h
View File

@ -178,16 +178,19 @@
#define MSG_INFO_EXTRUDERS "Extrusores" #define MSG_INFO_EXTRUDERS "Extrusores"
#define MSG_INFO_BAUDRATE "Baudios" #define MSG_INFO_BAUDRATE "Baudios"
#define MSG_INFO_PROTOCOL "Protocolo" #define MSG_INFO_PROTOCOL "Protocolo"
#define MSG_INFO_PRINT_COUNT "Conteo de impresion" #if LCD_WIDTH > 19
#define MSG_INFO_COMPLETED_PRINTS "Completadas" #define MSG_INFO_PRINT_COUNT "Conteo de impresion"
#define MSG_INFO_PRINT_TIME "Tiempo total de imp." #define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga" #define MSG_INFO_PRINT_TIME "Tiempo total de imp."
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion" #define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
#define MSG_INFO_PRINT_COUNT "Impresiones" #define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
#define MSG_INFO_COMPLETED_PRINTS "Completadas" #else
#define MSG_INFO_PRINT_TIME "Total" #define MSG_INFO_PRINT_COUNT "Impresiones"
#define MSG_INFO_PRINT_LONGEST "Mas larga" #define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_FILAMENT "Extrusion" #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_MIN_TEMP "Temperatura minima"
#define MSG_INFO_MAX_TEMP "Temperatura maxima" #define MSG_INFO_MAX_TEMP "Temperatura maxima"
#define MSG_INFO_PSU "Fuente de poder" #define MSG_INFO_PSU "Fuente de poder"
@ -204,13 +207,13 @@
#if LCD_HEIGHT >= 4 #if LCD_HEIGHT >= 4
// Up to 3 lines allowed // Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento" #define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar" #define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..." #define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
#else // LCD_HEIGHT < 4 #else // LCD_HEIGHT < 4
// Up to 2 lines allowed // Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar" #define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento" #define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
#endif // LCD_HEIGHT < 4 #endif // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por" #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"

Write Preview
Loading…
Cancel
Save