Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
1cdffded
Commit
1cdffded
authored
8 years ago
by
yhfudev
Committed by
Scott Lahteine
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix multiple definitions of message macros in the language-es.h
parent
48aa0f64
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/language_es.h
+18
-15
18 additions, 15 deletions
Marlin/language_es.h
with
18 additions
and
15 deletions
Marlin/language_es.h
+
18
−
15
View file @
1cdffded
...
@@ -178,16 +178,19 @@
...
@@ -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"
#if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
#define MSG_INFO_PRINT_COUNT "Conteo de impresion"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
#define MSG_INFO_PRINT_TIME "Tiempo total de imp."
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
#define MSG_INFO_PRINT_LONGEST "Impresion mas larga"
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
#define MSG_INFO_PRINT_FILAMENT "Total de Extrusion"
#else
#define MSG_INFO_PRINT_COUNT "Impresiones"
#define MSG_INFO_PRINT_COUNT "Impresiones"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_COMPLETED_PRINTS "Completadas"
#define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_LONGEST "Mas larga"
#define MSG_INFO_PRINT_LONGEST "Mas larga"
#define MSG_INFO_PRINT_FILAMENT "Extrusion"
#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"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment