SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 'Ultimaker' (PR#2331)

Browse source
This commit is contained in:
Richard Wackerbarth 2015-06-25 09:13:50 -05:00
commit a1e8714d5f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/language.h
View file

@ -46,7 +46,7 @@
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#define MACHINE_NAME "Ultimaker" #define MACHINE_NAME "Ultimaker"
#define SOURCE_CODE_URL "http://firmware.ultimaker.com" #define SOURCE_CODE_URL "https://github.com/Ultimaker/Marlin"
#elif MB(RUMBA) #elif MB(RUMBA)
#define MACHINE_NAME "Rumba" #define MACHINE_NAME "Rumba"
#elif MB(3DRAG) #elif MB(3DRAG)

12
Marlin/language_nl.h
View file

@ -101,7 +101,7 @@
#define MSG_DWELL "Slapen..." #define MSG_DWELL "Slapen..."
#define MSG_USERWAIT "Wachten..." #define MSG_USERWAIT "Wachten..."
#define MSG_RESUMING "Print hervatten" #define MSG_RESUMING "Print hervatten"
#define MSG_PRINT_ABORTED "Print aborted" #define MSG_PRINT_ABORTED "Print afgebroken"
#define MSG_NO_MOVE "Geen beweging." #define MSG_NO_MOVE "Geen beweging."
#define MSG_KILLED "AFGEBROKEN. " #define MSG_KILLED "AFGEBROKEN. "
#define MSG_STOPPED "GESTOPT. " #define MSG_STOPPED "GESTOPT. "
@ -127,11 +127,11 @@
#define MSG_END_MINUTE "minutes" #define MSG_END_MINUTE "minutes"
#ifdef DELTA_CALIBRATION_MENU #ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE "Delta Calibratie"
#define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_X "Kalibreer X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" #define MSG_DELTA_CALIBRATE_Y "Kalibreer Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" #define MSG_DELTA_CALIBRATE_Z "Kalibreer Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #define MSG_DELTA_CALIBRATE_CENTER "Kalibreer Midden"
#endif // DELTA_CALIBRATION_MENU #endif // DELTA_CALIBRATION_MENU
#endif // LANGUAGE_NL_H #endif // LANGUAGE_NL_H