3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 04:29:34 +00:00
Code Issues Releases Wiki Activity
6,109 Commits 20 Branches 80 Tags 1.8 GiB
b1a60e8954
Commit Graph

67 Commits

Author SHA1 Message Date
Scott Lahteine
aa30550b21 Keep SIMULATE_ROMFONT only language.h 2016-08-15 19:11:31 -07:00
Scott Lahteine
d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Kaibob2
1c7bd17e60 Update language_de.h with MSG_MOVE_E1 - E4 
MSG_MOVE_E1 was missing
MSG_MOVE_E2 was missing
MSG_MOVE_E3 was missing
MSG_MOVE_E4 was missing

I assigned "0" to "MSG_MOVE_E1", "1" to "MSG_MOVE_E2" and so on, as this is what i assume to be the standard naming for the first (E0) and second (E1) extruder. This would have to be changed inthe other languages too :(
 2016-08-09 20:49:26 +02:00
AnHardt
0d3b67a580 Repair-language.de 2016-08-06 01:00:40 +02:00
Kaibob2
1abd7fa670 Update language_de.h 
Added german translation for MSG_INFO_PRINT_LONGEST and  MSG_INFO_PRINT_FILAMENT.
MSG_HEATING_COMPLETE changed from "Aufgeheizt" to "Extr. aufgeheizt"
MSG_HEATING changed from "Aufheizen" to "Extr. aufheizen"
 2016-08-04 09:40:38 +02:00
esenapaj
af9b1d79b1 Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15) 
・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files
・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German
file
 2016-07-16 18:39:22 +09:00
Scott Lahteine
c5e51f6b96 finished => completed 2016-07-14 11:46:35 -07:00
Scott Lahteine
a5bae3c7d5 Merge pull request #4229 from blubbfish/patch-1 
Update language_de.h for German translation
 2016-07-12 20:01:46 -07:00
Scott Lahteine
1026e5b071 Replace PLA/ABS preheating with generic 2016-07-09 18:06:51 -07:00
Philip Schell
cf8ec1216a Update language_de.h for German translation 
@MarlinFirmware/language-team my changes for the German language. Feel free to improve :)
 2016-07-06 21:44:16 +02:00
AnHardt
39883d03fc universalize axis_unhomed_error() 2016-06-27 20:19:51 -07:00
esenapaj
fac58f0291 Cosmetic changes for language files 2016-06-21 21:13:25 +09:00
Torsten Kurbad
aae2f502e0 Revisited German translation 2016-05-02 15:18:12 +02:00
Blue-Marlin
e89f01d044 Correct an error in lang_de 
There is no way to translate "A-travel" to "A Rückzug". Thats simply
wrong.
 2016-04-27 12:59:48 +02:00
Michael Neumann
59cfc84dad German "Umlaute" 
We don't have to  avoid German "Umlaute" any more.
 2016-04-26 21:52:05 +02:00
Scott Lahteine
f90a8661cb Uppercase XYZE on Graphical LCD 2016-04-18 20:09:03 -07:00
Scott Lahteine
81918657f4 Fix Deutsch string errors, redundancies 2016-04-11 18:12:32 -07:00
Michael Conradt
f3a7a5c99b Merge branch 'RCBugFix' into translations 2016-04-11 03:50:23 +02:00
Michael Conradt
8b923039e2 Add missing german translations. 2016-04-11 03:20:21 +02:00
AnHardt
c3d1b7db2d de-language additions 2016-04-08 22:51:04 +02:00
Scott Lahteine
c94482168b Add MSG_LEVEL_BED_CANCEL for MBL 2016-04-03 16:27:29 -07:00
Scott Lahteine
5719fcba51 Add MSG_LEVEL_BED_DONE and MSG_LEVEL_BED_WAITING 2016-04-02 18:14:49 -07:00
Scott Lahteine
80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine
a393941d2d Combine "XYZ" with MSG_LEVEL_BED_HOMING 2016-04-01 17:51:03 -07:00
AnHardt
94962ee678 axis_known_position -> axis_homed 
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
 2016-03-25 14:05:20 +01:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
esenapaj
22299c13c1 Change link to the document 
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757,
but http://www.marlinfirmware.org/ isn't working.
 2016-03-22 19:58:41 +09:00
Scott Lahteine
6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine
0c7f7ebcfb Styling adjustments (PR#2668 & PR#2670) 
Keep "astyled" reformatting
 2015-10-03 22:02:45 -05:00
Scott Lahteine
7ac7ddbf20 Show nozzles, heaters, and extruders numbered 1-4 2015-09-12 07:40:18 -05:00
Scott Lahteine
4b40964064 Overridable Options - Part 3 (PR#2555) 
Apply `ENABLED` / `DISABLED` macros to language-related files.
 2015-07-31 00:19:13 -05:00
AnHardt
aaccea0260 Shift some display only strings from language.h to lenguage_en.h 
and translate them to German.
 2015-07-26 20:41:15 -05:00
CONSULitAS
c5dfb35597 language_de.h: updated translation and minor typos 
language_de.h: updated translation and minor typos
 2015-04-28 01:03:54 +02:00
Ivan Galvez Junquera
d08782386b Added new trasnslatable labels. 
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
 2015-03-31 16:59:43 +02:00
AnHardt
1883e1bb60 Applied thinkyheads corrections from 2015-03-17 2015-03-17 11:23:44 +01:00
AnHardt
96f8d20f2f Change selection logic another time 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
 2015-03-13 14:26:58 +01:00
AnHardt
97ae3c5c6a Corected some errors inrtoduced by a faild global replacement. 2015-03-11 10:26:36 +01:00
AnHardt
2d5134b0ed Introduce - clean - prepae language files 2015-03-10 17:46:25 +01:00
AnHardt
0e40408ee5 Make exemplaric use of new display charsets in language_en.h and languag_de.h 2015-02-01 13:20:58 +01:00
AnHardt
b3ca430a20 Inducted the defined placeholders in the translation table. 2015-01-30 10:35:14 +01:00
AnHardt
9a4d4b3a2f translated Deltamenu 2015-01-29 13:19:32 +01:00
AnHardt
8aa6487b4b MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein' 2015-01-29 13:12:55 +01:00
AnHardt
666ad7106b Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD 2015-01-29 13:09:12 +01:00
AnHardt
e5c45fbe8c Infoscreen messages end with a '.' if not to long. 
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
 2015-01-29 13:02:21 +01:00
AnHardt
1e22137e27 MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch' 
to work out that this can't be resumed.
 2015-01-29 12:41:46 +01:00
AnHardt
05d2ebd118 MSG_WATCH > 'Beobachten' > 'Info' 2015-01-29 12:29:31 +01:00
AnHardt
06cba91c39 eye candy 2 2015-01-29 12:26:21 +01:00
AnHardt
9352c9547f MSG_SPEED = 'Geschw' > 'Geschw.' 2015-01-29 12:13:44 +01:00
AnHardt
0dfb0162f3 eye candy. 2015-01-29 12:07:01 +01:00