Browse Source

Merge pull request #5492 from thinkyhead/rc_fix_language_es

Fix multiple definitions of message macros in the language-es.h
Scott Lahteine 7 years ago
parent
commit
1fd8185d37
1 changed files with 18 additions and 15 deletions
  1. 18
    15
      Marlin/language_es.h

+ 18
- 15
Marlin/language_es.h View File

178
 #define MSG_INFO_EXTRUDERS                  "Extrusores"
178
 #define MSG_INFO_EXTRUDERS                  "Extrusores"
179
 #define MSG_INFO_BAUDRATE                   "Baudios"
179
 #define MSG_INFO_BAUDRATE                   "Baudios"
180
 #define MSG_INFO_PROTOCOL                   "Protocolo"
180
 #define MSG_INFO_PROTOCOL                   "Protocolo"
181
-#define MSG_INFO_PRINT_COUNT                "Conteo de impresion"
182
-#define MSG_INFO_COMPLETED_PRINTS           "Completadas"
183
-#define MSG_INFO_PRINT_TIME                 "Tiempo total de imp."
184
-#define MSG_INFO_PRINT_LONGEST              "Impresion mas larga"
185
-#define MSG_INFO_PRINT_FILAMENT             "Total de Extrusion"
186
-#define MSG_INFO_PRINT_COUNT                "Impresiones"
187
-#define MSG_INFO_COMPLETED_PRINTS           "Completadas"
188
-#define MSG_INFO_PRINT_TIME                 "Total"
189
-#define MSG_INFO_PRINT_LONGEST              "Mas larga"
190
-#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
191
 #define MSG_INFO_MIN_TEMP                   "Temperatura minima"
194
 #define MSG_INFO_MIN_TEMP                   "Temperatura minima"
192
 #define MSG_INFO_MAX_TEMP                   "Temperatura maxima"
195
 #define MSG_INFO_MAX_TEMP                   "Temperatura maxima"
193
 #define MSG_INFO_PSU                        "Fuente de poder"
196
 #define MSG_INFO_PSU                        "Fuente de poder"
204
 
207
 
205
 #if LCD_HEIGHT >= 4
208
 #if LCD_HEIGHT >= 4
206
   // Up to 3 lines allowed
209
   // Up to 3 lines allowed
207
-  #define MSG_FILAMENT_CHANGE_INIT_2          "del filamento"
208
-  #define MSG_FILAMENT_CHANGE_INIT_3          "cambiar"
209
-  #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..."
210
 #else // LCD_HEIGHT < 4
213
 #else // LCD_HEIGHT < 4
211
   // Up to 2 lines allowed
214
   // Up to 2 lines allowed
212
-  #define MSG_FILAMENT_CHANGE_INIT_2          "del fil. cambiar"
213
-  #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"
214
 #endif // LCD_HEIGHT < 4
217
 #endif // LCD_HEIGHT < 4
215
 
218
 
216
 #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Esperado por"
219
 #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Esperado por"

Loading…
Cancel
Save