Update language_de.h #4806

blubbfish · 2016-09-14T12:17:36Z

@MarlinFirmware/language-team updated german languagefile to the latest english version

Blue-Marlin · 2016-09-14T13:36:38Z

Marlin/language_de.h

@@ -153,6 +159,12 @@
 #define MSG_ERR_MINTEMP                     LCD_STR_THERMOMETER " UNTERSCHRITTEN"
 #define MSG_ERR_MAXTEMP_BED                 "BETT " LCD_STR_THERMOMETER " ÜBERSCHRITTEN"
 #define MSG_ERR_MINTEMP_BED                 "BETT " LCD_STR_THERMOMETER " UNTERSCHRITTEN"
+#define MSG_ERR_Z_HOMING                    "G28 Z Forbidden"


Verboten ???

I think thats Gcode and send to the USB-Host, so i prefer not to change that line. But i'm not shure

It's preceded by "echo:" and not "error:" and also appears on the LCD. So it's fine to translate.

The concept is:

All strings in language_en.h can be translated. (Display)

No string in language.h shall be translated. (Serial)

That too. I placed the string in language_en.h with the intent that it should be translated and that hosts should simply echo it.

That seems to be a good idea. :) But then there is maybe a "bug" in the code:

// Disallow Z homing if X or Y are unknown
if (!axis_known_position[X_AXIS] || !axis_known_position[Y_AXIS]) {
LCD_MESSAGEPGM(MSG_ERR_Z_HOMING);
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_ERR_Z_HOMING);
return;
}
https://github.com/MarlinFirmware/Marlin/blob/RCBugFix/Marlin/Marlin_main.cpp#L2746

So that string is used for both

If that does nothing with the functionality i had no problem to change that line to
#define MSG_ERR_Z_HOMING "G28 Z Verboten"
as @Blue-Marlin would prefer. But i don't want to crash all Serial clients ;)

You are right. This is not clean. But saves the space for a second string.
However. Hosts do not react on that, when printed with 'echo'. Even when printed with 'error' the host should react with stopping to send on __ every__ unknown error.

FHeilmann

Left some comments. I hope its okay that I also went and suggested some changes to not-new strings. If this is not desired here I can create a separate pull request where I go over the whole file suggesting changes.

FHeilmann · 2016-09-15T08:54:28Z

Marlin/language_de.h

@@ -153,6 +159,12 @@
 #define MSG_ERR_MINTEMP                     LCD_STR_THERMOMETER " UNTERSCHRITTEN"
 #define MSG_ERR_MAXTEMP_BED                 "BETT " LCD_STR_THERMOMETER " ÜBERSCHRITTEN"
 #define MSG_ERR_MINTEMP_BED                 "BETT " LCD_STR_THERMOMETER " UNTERSCHRITTEN"
+#define MSG_ERR_Z_HOMING                    "G28 Z Forbidden"
+#define MSG_HALTED                          "DRUCKER STOPP"
+#define MSG_PLEASE_RESET                    "Bitte Resetten"


I would prefer "Bitte zurücksetzen" here.

Wer nicht weis was ein Reset ist, hat an einem 3D-Drucker nichts verloren.

FHeilmann · 2016-09-15T08:54:43Z

Marlin/language_de.h

 #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
 #define MSG_LEVEL_BED_WAITING               "Klick für Start"
+#define MSG_LEVEL_BED_NEXT_POINT            "Nächster Punkt"


"Punkt" is very ambiguous in the German language. My personal preference here would be "Nächste Koordinate" which precisely describes what we are "moving to" during bed leveling.

12345678901234567890 Nächste Koordinate

Ok.

FHeilmann · 2016-09-15T08:56:51Z

Marlin/language_de.h

@@ -88,6 +93,7 @@
 #define MSG_PID_I                           "PID I"
 #define MSG_PID_D                           "PID D"
 #define MSG_PID_C                           "PID C"
+#define MSG_SELECT                          "Auswählen"
 #define MSG_ACC                             "A"
 #define MSG_VXY_JERK                        "V XY Jerk"
 #define MSG_VZ_JERK                         "V Z  Jerk"


The derivative of acceleration (jerk) is called "Ruck" in German https://de.wikipedia.org/wiki/Ruck

Eben dieser link is nicht hilfreich, weil 'jerk' in Marlin anders definiert ist. (http://forums.reprap.org/read.php?245,676970)

Eine Suche nach "Marlin jerk" war bisher immer wesentlich Zielführender.

(i'll stick with english so the others can weigh in)
Point taken, I didn't know about this, however, I would further argue if the English Marlin community justifies assigning the word Jerk to this behavior in Marlin I believe we should follow suit in the German translation.

FHeilmann · 2016-09-15T08:58:48Z

Marlin/language_de.h

 #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
 #define MSG_LEVEL_BED_WAITING               "Klick für Start"
+#define MSG_LEVEL_BED_NEXT_POINT            "Nächster Punkt"
 #define MSG_LEVEL_BED_DONE                  "Fertig"
 #define MSG_LEVEL_BED_CANCEL                "Abbruch"
 #define MSG_SET_HOME_OFFSETS                "Setze Homeoffsets"


Offset has a nice German equivalent word: "Versatz". Using "Homeversatz setzen/einstellen" conveys the idea much better.

12345678901234567890 Homeversatz setzen/einstellen Setze Homeversatz

FHeilmann · 2016-09-15T09:00:12Z

Marlin/language_de.h

+#define MSG_PLEASE_RESET                    "Bitte Resetten"
+#define MSG_SHORT_DAY                       "t" // One character only
+#define MSG_SHORT_HOUR                      "h" // One character only
+#define MSG_SHORT_MINUTE                    "m" // One character only
 #define MSG_HEATING                         "Extr. Aufheizen..."


Since this is a message indicating that the extruder is currently heating "Extr. heizt..." makes more sense here.
"Extr. Aufheizen" would fit better as a menu message which you select in order to heat up the extruder.

FHeilmann · 2016-09-15T09:02:08Z

Marlin/language_de.h

@@ -36,12 +36,17 @@
 #define WELCOME_MSG                         MACHINE_NAME " bereit"
 #define MSG_SD_INSERTED                     "SD-Karte erkannt"
 #define MSG_SD_REMOVED                      "SD-Karte entfernt"
+#define MSG_LCD_ENDSTOPS                    "Endstopp" // Max length 8 characters
 #define MSG_MAIN                            "Hauptmenü"
 #define MSG_AUTOSTART                       "Autostart"
 #define MSG_DISABLE_STEPPERS                "Motoren aus" // M84


"Motoren deaktivieren" is better here imho. "Motoren aus" is more suited for a status indication rather than the actual act of disabling the steppers.

12345678901234567890 Motoren deaktivieren

Ok.

FHeilmann · 2016-09-15T09:02:37Z

Marlin/language_de.h

+#define MSG_PLEASE_RESET                    "Bitte Resetten"
+#define MSG_SHORT_DAY                       "t" // One character only
+#define MSG_SHORT_HOUR                      "h" // One character only
+#define MSG_SHORT_MINUTE                    "m" // One character only
 #define MSG_HEATING                         "Extr. Aufheizen..."
 #define MSG_HEATING_COMPLETE                "Extr. aufgeheizt"
 #define MSG_BED_HEATING                     "Bett aufheizen"


Same as my other comment. "Bett heizt..." instead of "Bett aufheizen"

blubbfish · 2016-09-15T10:41:52Z

Ok that sounds very nice, i will change my pullrequest to your comments :)

blubbfish · 2016-09-15T13:17:44Z

So the next tweaks to existing strings should be an own pullrequest. I want to make the language up to date with that request.

FHeilmann

1 small comment, otherwise looks good to me!

FHeilmann · 2016-09-15T13:43:14Z

Marlin/language_de.h

 #define MSG_LEVEL_BED_DONE                  "Fertig"
 #define MSG_LEVEL_BED_CANCEL                "Abbruch"
-#define MSG_SET_HOME_OFFSETS                "Setze Homeoffsets"
+#define MSG_SET_HOME_OFFSETS                "Setze Homeversatz"


Even though we agreed to change this, I would hold out on this change for now, since we will have to replace a few instances of "offset" when we change this. Other than that it looks good to me.

I would leaf it now to "versatz" if we also want to change the rest. This file will be changed in the future often, so it makes no different to change it now back and in a lot of days again ;)

So it is equal, But now travis says that merge is ok and it don't need to be run again for one word.

Update language_de.h

54e6d12

@MarlinFirmware/language-team updated german languagefile to the latest english version

Blue-Marlin reviewed Sep 14, 2016
View reviewed changes

FHeilmann suggested changes Sep 15, 2016

View reviewed changes

Update language_de.h

2b11c32

FHeilmann approved these changes Sep 15, 2016

View reviewed changes

thinkyhead added the C: Language label Sep 15, 2016

thinkyhead merged commit b08bd84 into MarlinFirmware:RCBugFix Sep 16, 2016

thinkyhead mentioned this pull request Oct 24, 2016

Release 1.1.0-RC8 #5077

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update language_de.h #4806

Update language_de.h #4806

blubbfish commented Sep 14, 2016

Blue-Marlin Sep 14, 2016

blubbfish Sep 14, 2016

thinkyhead Sep 14, 2016

Blue-Marlin Sep 14, 2016 •

edited

Loading

thinkyhead Sep 14, 2016 •

edited

Loading

blubbfish Sep 15, 2016

blubbfish Sep 15, 2016

Blue-Marlin Sep 15, 2016

FHeilmann left a comment

FHeilmann Sep 15, 2016

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016 •

edited

Loading

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016

FHeilmann Sep 15, 2016 •

edited

Loading

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016 •

edited

Loading

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016 •

edited

Loading

Blue-Marlin Sep 15, 2016

FHeilmann Sep 15, 2016

Blue-Marlin Sep 15, 2016

blubbfish commented Sep 15, 2016

blubbfish commented Sep 15, 2016

FHeilmann left a comment

FHeilmann Sep 15, 2016

blubbfish Sep 15, 2016

Update language_de.h #4806

Update language_de.h #4806

Conversation

blubbfish commented Sep 14, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Blue-Marlin Sep 14, 2016 • edited Loading

Choose a reason for hiding this comment

thinkyhead Sep 14, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FHeilmann left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FHeilmann Sep 15, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FHeilmann Sep 15, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FHeilmann Sep 15, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FHeilmann Sep 15, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blubbfish commented Sep 15, 2016

blubbfish commented Sep 15, 2016

FHeilmann left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Blue-Marlin Sep 14, 2016 •

edited

Loading

thinkyhead Sep 14, 2016 •

edited

Loading

FHeilmann Sep 15, 2016 •

edited

Loading

FHeilmann Sep 15, 2016 •

edited

Loading

FHeilmann Sep 15, 2016 •

edited

Loading

FHeilmann Sep 15, 2016 •

edited

Loading