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
5a332df4
Commit
5a332df4
authored
11 years ago
by
neildarlow
Browse files
Options
Downloads
Plain Diff
Merge
https://github.com/ErikZalm/Marlin
into Marlin_v1
parents
7325d710
040357fd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/language.h
+4
-5
4 additions, 5 deletions
Marlin/language.h
with
4 additions
and
5 deletions
Marlin/language.h
+
4
−
5
View file @
5a332df4
...
...
@@ -1564,8 +1564,8 @@
#define MSG_PREHEAT_ABS "Esilammita ABS"
#define MSG_PREHEAT_ABS_SETTINGS "Esilamm. ABS konf"
#define MSG_COOLDOWN "Jaahdyta"
#define MSG_SWITCH_PS_ON "
Switch Power On
"
#define MSG_SWITCH_PS_OFF "
Switch Power Off
"
#define MSG_SWITCH_PS_ON "
Virta paalle
"
#define MSG_SWITCH_PS_OFF "
Virta pois
"
#define MSG_EXTRUDE "Pursota"
#define MSG_RETRACT "Veda takaisin"
#define MSG_MOVE_AXIS "Liikuta akseleita"
...
...
@@ -1649,7 +1649,6 @@
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "Contrast"
// Serial Console Messages
...
...
@@ -1725,8 +1724,8 @@
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Babystepping Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_CONTRAST "
C
ontrast"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "
Error in menu structure
"
#define MSG_CONTRAST "
K
ontrast
i
"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "
Virhe valikon rakenteessa
"
#endif
...
...
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