From 2a65094a1d8d2763acba535967c87a9c8c2c1290 Mon Sep 17 00:00:00 2001 From: ottovdv Date: Mon, 9 Dec 2013 14:55:58 +0100 Subject: [PATCH 1/3] Dutch translation added Language choice 5 added: Dutch --- Marlin/language.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/language.h b/Marlin/language.h index 590d99219d15..91aac373148a 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -6,7 +6,8 @@ // 2 English // 3 French (Waiting translation) // 4 German (Waiting translation) -// 5 Etc +// 5 Dutch (Nederlands) +// 6 Etc #define LANGUAGE_CHOICE 1 // Pick your language from the list above From 175a5eb4ce6dbeee61e64dca190c2901dccba0ad Mon Sep 17 00:00:00 2001 From: ottovdv Date: Mon, 9 Dec 2013 14:59:22 +0100 Subject: [PATCH 2/3] Dutch translation added --- Marlin/language.h | 180 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 170 insertions(+), 10 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 91aac373148a..cab8766cd8cc 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -63,8 +63,10 @@ #define MSG_MAIN_WIDE " Main \003" #define MSG_TEMPERATURE_WIDE " Temperature \x7E" #define MSG_MOTION_WIDE " Motion \x7E" - #define MSG_STORE_EPROM " Store memory" - #define MSG_LOAD_EPROM " Load memory" + #define MSG_STORE_EPROM " Store memory" + + #define MSG_LOAD_EPROM " Load memory" + #define MSG_RESTORE_FAILSAFE " Restore Failsafe" #define MSG_REFRESH "\004Refresh" #define MSG_WATCH " Watch \003" @@ -76,12 +78,15 @@ #define MSG_CARD_MENU " Card Menu \x7E" #define MSG_NO_CARD " No Card" #define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure." - #define MSG_DWELL "Sleep..." - #define MSG_USERWAIT "Wait for user..." + #define MSG_DWELL "Sleep..." + + #define MSG_USERWAIT "Wait for user..." + #define MSG_NO_MOVE "No move." #define MSG_PART_RELEASE "Partial Release" #define MSG_KILLED "KILLED. " - #define MSG_STOPPED "STOPPED. " + #define MSG_STOPPED "STOPPED. " + #define MSG_PREHEAT_PLA " Preheat PLA" #define MSG_PREHEAT_ABS " Preheat ABS" #define MSG_STEPPER_RELEASED "Released." @@ -95,7 +100,8 @@ #define MSG_BROWNOUT_RESET " Brown out Reset" #define MSG_WATCHDOG_RESET " Watchdog Reset" #define MSG_SOFTWARE_RESET " Software Reset" - #define MSG_MARLIN "Marlin " + #define MSG_MARLIN "Marlin " + #define MSG_AUTHOR " | Author: " #define MSG_CONFIGURATION_VER " Last Updated: " #define MSG_FREE_MEMORY " Free Memory: " @@ -120,7 +126,8 @@ #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1\n" #define MSG_COUNT_X " Count X:" #define MSG_ERR_KILLED "Printer halted. kill() called !!" - #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)" + #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!. (Temperature is reset. Set it before restarting)" + #define MSG_RESEND "Resend:" #define MSG_UNKNOWN_COMMAND "Unknown command:\"" #define MSG_ACTIVE_EXTRUDER "Active Extruder: " @@ -174,7 +181,7 @@ #define MSG_PREHEAT_PLA " Preheat PLA" #define MSG_PREHEAT_ABS " Preheat ABS" #define MSG_MOVE_AXIS " Move Axis \x7E" - #define MSG_MOVE_AXIS " Achsen verfahren \x7E" + #define MSG_MOVE_AXIS " Achsen verfahren \x7E" #define MSG_SPEED " Geschw:" #define MSG_NOZZLE " \002Duese:" #define MSG_BED " \002Bett:" @@ -264,7 +271,8 @@ #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1\n" #define MSG_COUNT_X " Count X:" #define MSG_ERR_KILLED "Printer halted. kill() called !!" - #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!" + #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart!" + #define MSG_RESEND "Resend:" #define MSG_UNKNOWN_COMMAND "Unknown command:\"" #define MSG_ACTIVE_EXTRUDER "Active Extruder: " @@ -298,4 +306,156 @@ #define MSG_ERR_LONG_EXTRUDE_STOP " too long extrusion prevented" #endif -#endif // ifndef LANGUAGE_H + +#if LANGUAGE_CHOICE == 5 +// Dutch messages by ottovdv +// LCD Menu Messages + + #define WELCOME_MSG "Printer Gereed." + #define MSG_STANDBY_TEMP "Standby temp ingesteld op: " + #define MSG_SD_INSERTED "Kaart ingevoerd" + #define MSG_SD_REMOVED "Kaart uitgenomen" + #define MSG_MAIN " Main \003" + #define MSG_AUTOSTART " Autostart" + #define MSG_DISABLE_STEPPERS " Steppers Uitschakelen" + #define MSG_AUTO_HOME " Auto Home" + #define MSG_SET_ORIGIN " Stel Oorsprong in" + #define MSG_COOLDOWN " Afkoelen" + #define MSG_EXTRUDE " Extruden" + #define MSG_PREHEAT_PLA " Voorverwarmen PLA" + #define MSG_PREHEAT_ABS " Voorverwarmen ABS" + #define MSG_MOVE_AXIS " Beweeg as \x7E" + #define MSG_SPEED " Snelheid:" + #define MSG_NOZZLE " \002Nozzle:" + #define MSG_BED " \002Bed:" + #define MSG_FAN_SPEED " Snelheid ventilator:" + #define MSG_FLOW " Stroom:" + #define MSG_CONTROL " Bediening \003" + #define MSG_MIN " \002 Min:" + #define MSG_MAX " \002 Max:" + #define MSG_FACTOR " \002 Fact:" + #define MSG_AUTOTEMP " Autotemp:" + #define MSG_ON "Aan " + #define MSG_OFF "Uit" + #define MSG_PID_P " PID-P: " + #define MSG_PID_I " PID-I: " + #define MSG_PID_D " PID-D: " + #define MSG_PID_C " PID-C: " + #define MSG_ACC " Acc:" + #define MSG_VXY_JERK " Vxy-stoot: " + #define MSG_VMAX " Vmax " + #define MSG_X "x:" + #define MSG_Y "y:" + #define MSG_Z "z:" + #define MSG_E "e:" + #define MSG_VMIN " Vmin:" + #define MSG_VTRAV_MIN " VTrav min:" + #define MSG_AMAX " Amax " + #define MSG_A_RETRACT " A-terugtrekking:" + #define MSG_XSTEPS " Xstappen/mm:" + #define MSG_YSTEPS " Ystappen/mm:" + #define MSG_ZSTEPS " Zstappen/mm:" + #define MSG_ESTEPS " Estappen/mm:" + #define MSG_MAIN_WIDE " Hoofd \003" + #define MSG_TEMPERATURE_WIDE " Temperatuur \x7E" + #define MSG_MOTION_WIDE " Beweging \x7E" + #define MSG_STORE_EPROM " Opslag geheugen" + + #define MSG_LOAD_EPROM " Laad geheugen" + + #define MSG_RESTORE_FAILSAFE " Herstel Failsafe" + #define MSG_REFRESH "\004Verversen" + #define MSG_WATCH " Volg \003" + #define MSG_PREPARE " Voorbereiden \x7E" + #define MSG_PREPARE_ALT " Voorbereiden \003" + #define MSG_CONTROL_ARROW " Controle \x7E" + #define MSG_TUNE " Instellen \x7E" + #define MSG_STOP_PRINT " Stop Print \x7E" + #define MSG_CARD_MENU " Kaart Menu \x7E" + #define MSG_NO_CARD " Geen kaart" + #define MSG_SERIAL_ERROR_MENU_STRUCTURE "Er is iets mis in de MenuStructuur." + #define MSG_DWELL "Slapen..." + + #define MSG_USERWAIT "Wacht op gebruiker..." + + #define MSG_NO_MOVE "Geen beweging." + #define MSG_PART_RELEASE "Gedeeltelijke Release" + #define MSG_KILLED "KILLED. " + #define MSG_STOPPED "GESTOPT. " + + #define MSG_PREHEAT_PLA " Voorverwarmen PLA" + #define MSG_PREHEAT_ABS " Voorverwarmen ABS" + #define MSG_STEPPER_RELEASED "Released." + + +// Serial Console Messages + + #define MSG_Enqueing "in rij geplaatst \"" + #define MSG_POWERUP "Opstarten" + #define MSG_EXTERNAL_RESET " Externe Reset" + #define MSG_BROWNOUT_RESET " Brown out Reset" + #define MSG_WATCHDOG_RESET " Watchdog Reset" + #define MSG_SOFTWARE_RESET " Software Reset" + #define MSG_MARLIN "Marlin " + + #define MSG_AUTHOR " | Auteur: " + #define MSG_CONFIGURATION_VER " Laatste Update: " + #define MSG_FREE_MEMORY " Geheugen vrij: " + #define MSG_PLANNER_BUFFER_BYTES " PlannerBufferBytes: " + #define MSG_OK "ok" + #define MSG_FILE_SAVED "Bestand opslaan gereed." + #define MSG_ERR_LINE_NO "Regelnummer is niet laatste regelnummer+1, Laatste Regel:" + #define MSG_ERR_CHECKSUM_MISMATCH "checksum fout, Laatste Regel:" + #define MSG_ERR_NO_CHECKSUM "Geen Checksum op regel nummer, Laatste Regel:" + #define MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM "Geen regelnummer met checksum, laatste regel:" + #define MSG_FILE_PRINTED "Printen bestand gereed" + #define MSG_BEGIN_FILE_LIST "Begin bestandslijst" + #define MSG_END_FILE_LIST "Eind bestandslijst" + #define MSG_M104_INVALID_EXTRUDER "M104 Ongeldige extruder " + #define MSG_M105_INVALID_EXTRUDER "M105 Ongeldige extruder " + #define MSG_ERR_NO_THERMISTORS "Geen thermistors - geen temp" + #define MSG_M109_INVALID_EXTRUDER "M109 Ongeldige extruder " + #define MSG_HEATING "Opwarmen..." + #define MSG_HEATING_COMPLETE "Opwarmen gereed." + #define MSG_BED_HEATING "Bed Opwarmen." + #define MSG_BED_DONE "Bed gereed." + #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:http://www.mendel-parts.com PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:1\n" + #define MSG_COUNT_X " Count X:" + #define MSG_ERR_KILLED "Printer gestopt. kill() aangeroepen !!" + #define MSG_ERR_STOPPED "Printer gestopt ten gevolge van fouten. Herstel de fout en gebruik M999 voor herstart!. (Temperatuur is gereset. Stel in voor herstart)" + + #define MSG_RESEND "Opnieuw versturen:" + #define MSG_UNKNOWN_COMMAND "Onbekend commando:\"" + #define MSG_ACTIVE_EXTRUDER "Actieve extruder: " + #define MSG_INVALID_EXTRUDER "Ongeldige extruder" + #define MSG_X_MIN "x_min:" + #define MSG_X_MAX "x_max:" + #define MSG_Y_MIN "y_min:" + #define MSG_Y_MAX "y_max:" + #define MSG_Z_MIN "z_min:" + #define MSG_Z_MAX "z_max:" + + #define MSG_SD_CANT_OPEN_SUBDIR "Kan submap niet openen" + #define MSG_SD_INIT_FAIL "SD init mislukt" + #define MSG_SD_VOL_INIT_FAIL "volume.init mislukt" + #define MSG_SD_OPENROOT_FAIL "openRoot mislukt" + #define MSG_SD_CARD_OK "SD kaart ok" + #define MSG_SD_WORKDIR_FAIL "WerkMap openen mislukt" + #define MSG_SD_OPEN_FILE_FAIL "openen mislukt, Bestand: " + #define MSG_SD_FILE_OPENED "Bestand geopend:" + #define MSG_SD_SIZE " Grootte:" + #define MSG_SD_FILE_SELECTED "Bestand geselecteerd" + #define MSG_SD_WRITE_TO_FILE "Schrijven naar bestand: " + #define MSG_SD_PRINTING_BYTE "SD printen byte " + #define MSG_SD_NOT_PRINTING "Niet SD printen" + #define MSG_SD_ERR_WRITE_TO_FILE "fout in schrijven naar bestand" + #define MSG_SD_CANT_ENTER_SUBDIR "Kan niet naar submap:" + + #define MSG_STEPPER_TO_HIGH "Steprate te groot : " + #define MSG_ENDSTOPS_HIT "endstops geraakt: " + #define MSG_ERR_COLD_EXTRUDE_STOP " koude extrusie voorkomen" + #define MSG_ERR_LONG_EXTRUDE_STOP " te lange extrusie voorkomen" + +#endif + +#endif // ifndef LANGUAGE_H \ No newline at end of file From cf8ccac632e8a209860b607f2738979071ac15fc Mon Sep 17 00:00:00 2001 From: ottovdv Date: Mon, 9 Dec 2013 15:00:51 +0100 Subject: [PATCH 3/3] apple only files --- .gitignore | 2 ++ Marlin/.DS_Store | Bin 15364 -> 0 bytes 2 files changed, 2 insertions(+) create mode 100644 .gitignore delete mode 100644 Marlin/.DS_Store diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..61b08c6e2a8b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +Marlin/.DS_Store diff --git a/Marlin/.DS_Store b/Marlin/.DS_Store deleted file mode 100644 index ccf861fc019a16bdb5cf85fb18c8068344b6ecb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15364 zcmeHMOKuZE5Uq|)V#oPdWW#cHWQAbI(h5mX7C@AM1gqfutvDXb`HGc~kt1*v794;h zaEtI>cN4mMX3PemD5|!mD;d}8s(Mw^qb`exS-IGMA(Dwm0~cj`4pYhC_q+;Y%HMek zX@D2$$&p;hNV;-f(AFEufHI&AC=6L6j@x$NZ=3@xCiAl6<=9CJ#hUK)U_8|LBZhHse4kMrvg760Ne36>;9|UG z<4-8YS_dw(>S8)h>Z}YX14RaSc3+fNlFL92qw{;u-g_p;8~uE5x1aAqlMmN-T+6u3 z?JZ`Jr3vUAbOQF}Qi`jr1G#)_hh1d`tGts<`6L_iR$j+8%~qm4FKhU0$`&whCO0OTQXBRK_jPlhs#J+z=HN*8lgd?98Am;-QL?j2Y+jUc*5ciM?Bj3d%)fak89U~N_j zY{YTX_Y(aPG<%4kz%%m_>Cf8r|L6}9Lt+C=in#{2HP3B3!feAg)zvDRxm_D;h@JEL^ftsMHf_8=1AiZ*>T+MX1KC0S@u{T``NWvR zHQIk!Bk{q;9pa}^^UUa3MNUKA7Ia+&4{UDAvx2NneGH;(7Ep;#tj!3~knOwYgudm) z+Klw4pmd+1GF-tPpRowl zET9qw3@S51V58Qd3@8K2fHI&AC(_c