Skip to content

Updates to German language#5248

Closed
Kaibob2 wants to merge 2 commits intoMarlinFirmware:RCBugFixfrom
Kaibob2:RCBugFix
Closed

Updates to German language#5248
Kaibob2 wants to merge 2 commits intoMarlinFirmware:RCBugFixfrom
Kaibob2:RCBugFix

Conversation

@Kaibob2
Copy link
Contributor

@Kaibob2 Kaibob2 commented Nov 18, 2016

RCBugFix won't compile due to a missing semicolon in Marlin_main.cpp when CASE_LIGHT_DEFAULT_ON is enabled.
This could also be fixed by merging #5243

RCBugFix won't compile due to a missing semicolon in marlin_main.cpp when CASE_LIGHT_DEFAULT_ON is enabled.
Grammar and "better german" corrections
= true
= true;
#else
;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be also fixed by moving semicolon after #endif and removing #else like:

static bool case_light_on
       #if ENABLED(CASE_LIGHT_DEFAULT_ON)
         = true
       #endif
       ;

@thinkyhead
Copy link
Member

thinkyhead commented Nov 19, 2016

Oops. I patched the typo before I saw this PR. You'll need to do a git fetch MarlinFirmware and git rebase -i MarlinFirmware/RCBugFix on this branch to fix the conflict.

@thinkyhead thinkyhead changed the title Compile error when CASE_LIGHT_DEFAULT_ON is enabled Updates to German language Nov 19, 2016
@Kaibob2
Copy link
Contributor Author

Kaibob2 commented Nov 19, 2016

I will fix this with another pull request until i figured out how to work reliable with git desktop.

@Kaibob2 Kaibob2 closed this Nov 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants