fixed incorrect menu messages from last commit...
- removed several multiple definitions of same message - fixed definition of missing messages in german and spanish - tweaked german translation (a lot) - added note about changing and testing this file
This commit is contained in:
		| @@ -1,11 +1,16 @@ | ||||
| #ifndef LANGUAGE_H | ||||
| #define LANGUAGE_H | ||||
|  | ||||
| // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES | ||||
| // | ||||
| //   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"  | ||||
| //   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS | ||||
|  | ||||
| // Languages | ||||
| // 1  Custom (For you to add your own messages) | ||||
| // 2  English  | ||||
| // 1  English | ||||
| // 2  - | ||||
| // 3  French	(Waiting translation) | ||||
| // 4  German	(Waiting translation) | ||||
| // 4  German | ||||
| // 5  Spanish | ||||
| // 6  Etc | ||||
|  | ||||
| @@ -37,7 +42,7 @@ | ||||
| 	#define MSG_SET_ORIGIN " Set Origin" | ||||
| 	#define MSG_COOLDOWN " Cooldown" | ||||
| 	#define MSG_EXTRUDE " Extrude" | ||||
| 	#define MSG_RETRACT " Extract" | ||||
| 	#define MSG_RETRACT " Retract" | ||||
| 	#define MSG_PREHEAT_PLA " Preheat PLA" | ||||
| 	#define MSG_PREHEAT_ABS " Preheat ABS" | ||||
| 	#define MSG_MOVE_AXIS " Move Axis      \x7E" | ||||
| @@ -86,29 +91,27 @@ | ||||
| 	#define MSG_PREPARE " Prepare \x7E" | ||||
| 	#define MSG_PREPARE_ALT " Prepare \003" | ||||
| 	#define MSG_CONTROL_ARROW " Control \x7E" | ||||
| 	#define MSG_RETRACT_ARROW " Control \x7E" | ||||
| 	#define MSG_RETRACT_ARROW " Retract \x7E" | ||||
| 	#define MSG_TUNE " Tune    \x7E" | ||||
| 	#define MSG_PAUSE_PRINT " Pause Print \x7E" | ||||
| 	#define MSG_RESUME_PRINT " Resume Print \x7E" | ||||
| 	#define MSG_STOP_PRINT " Stop Print   \x7E" | ||||
| 	#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_NO_MOVE "No move." | ||||
| 	#define MSG_PART_RELEASE "Partial Release" | ||||
| 	#define MSG_KILLED "KILLED. " | ||||
| 	#define MSG_STOPPED "STOPPED. " | ||||
| 	#define MSG_PREHEAT_PLA " Preheat PLA" | ||||
| 	#define MSG_PREHEAT_ABS " Preheat ABS" | ||||
| 	#define MSG_STEPPER_RELEASED "Released." | ||||
|   #define MSG_CONTROL_RETRACT  " Retract mm:" | ||||
|   #define MSG_CONTROL_RETRACTF " Retract  F:" | ||||
|   #define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:" | ||||
|   #define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:" | ||||
|   #define MSG_CONTROL_RETRACT_RECOVERF " UnRet  F:" | ||||
|   #define MSG_AUTORETRACT " AutoRetr.:" | ||||
|         #define MSG_CONTROL_RETRACT  " Retract mm:" | ||||
|         #define MSG_CONTROL_RETRACTF " Retract  F:" | ||||
|         #define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:" | ||||
|         #define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:" | ||||
|         #define MSG_CONTROL_RETRACT_RECOVERF " UnRet  F:" | ||||
|         #define MSG_AUTORETRACT " AutoRetr.:" | ||||
| 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Something is wrong in the MenuStructure." | ||||
|  | ||||
| // Serial Console Messages | ||||
|  | ||||
| @@ -181,84 +184,87 @@ | ||||
|  | ||||
| // LCD Menu Messages | ||||
|  | ||||
| 	#define WELCOME_MSG MACHINE_NAME " Ready." | ||||
| 	#define WELCOME_MSG MACHINE_NAME " Bereit." | ||||
|  | ||||
| 	#define MSG_SD_INSERTED "Card inserted" | ||||
| 	#define MSG_SD_REMOVED "Card removed" | ||||
| 	#define MSG_MAIN " Main \003" | ||||
| 	#define MSG_AUTOSTART " Autostart" | ||||
| 	#define MSG_SD_INSERTED      "SDKarte erkannt" | ||||
| 	#define MSG_SD_REMOVED       "SDKarte entfernt" | ||||
| 	#define MSG_MAIN             " Hauptmneü \003" | ||||
| 	#define MSG_AUTOSTART        " Autostart" | ||||
| 	#define MSG_DISABLE_STEPPERS " Stepper abschalten" | ||||
| 	#define MSG_AUTO_HOME " Auto Heim" | ||||
| 	#define MSG_SET_ORIGIN " Position setzen" | ||||
| 	#define MSG_PREHEAT_PLA " Aufheizen PLA" | ||||
| 	#define MSG_PREHEAT_ABS " Aufheizen ABS" | ||||
| 	#define MSG_COOLDOWN " Abkuehlen" | ||||
| 	#define MSG_EXTRUDE " Extrude" | ||||
| 	#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_SPEED " Geschw:" | ||||
| 	#define MSG_NOZZLE " \002Duese:" | ||||
| 	#define MSG_NOZZLE1 " \002Duese2:" | ||||
| 	#define MSG_NOZZLE2 " \002Duese3:" | ||||
| 	#define MSG_BED " \002Bett:" | ||||
| 	#define MSG_FAN_SPEED " Luefter geschw.:" | ||||
| 	#define MSG_FLOW " Fluss:" | ||||
| 	#define MSG_CONTROL " Kontrolle \003" | ||||
| 	#define MSG_MIN " \002 Min:" | ||||
| 	#define MSG_MAX " \002 Max:" | ||||
| 	#define MSG_FACTOR " \002 Faktor:" | ||||
| 	#define MSG_AUTOTEMP " AutoTemp:" | ||||
| 	#define MSG_ON "Ein " | ||||
| 	#define MSG_OFF "Aus " | ||||
| 	#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-jerk: " | ||||
| 	#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-retract:" | ||||
| 	#define MSG_XSTEPS " Xsteps/mm:" | ||||
| 	#define MSG_YSTEPS " Ysteps/mm:" | ||||
| 	#define MSG_ZSTEPS " Zsteps/mm:" | ||||
| 	#define MSG_ESTEPS " Esteps/mm:" | ||||
| 	#define MSG_MAIN_WIDE " Main        \003" | ||||
| 	#define MSG_TEMPERATURE_WIDE " Temperatur \x7E" | ||||
| 	#define MSG_MOTION_WIDE " Motion      \x7E" | ||||
| 	#define MSG_STORE_EPROM " EPROM speichern" | ||||
| 	#define MSG_LOAD_EPROM "  EPROM laden" | ||||
| 	#define MSG_RESTORE_FAILSAFE " Standard Konfig." | ||||
| 	#define MSG_REFRESH "\004Refresh" | ||||
| 	#define MSG_WATCH " Beobachten   \003" | ||||
| 	#define MSG_PREPARE " Prepare \x7E" | ||||
| 	#define MSG_PREPARE_ALT " Prepare \003" | ||||
| 	#define MSG_CONTROL_ARROW " Control \x7E" | ||||
| 	#define MSG_AUTO_HOME        " Auto Nullpunkt" | ||||
| 	#define MSG_SET_ORIGIN       " Setze Nullpunkt" | ||||
| 	#define MSG_PREHEAT_PLA      " Vorwärmen PLA" | ||||
| 	#define MSG_PREHEAT_ABS      " Vorwärmen ABS" | ||||
| 	#define MSG_COOLDOWN         " Abkühlen" | ||||
| 	#define MSG_EXTRUDE          " Extrude" | ||||
| 	#define MSG_RETRACT          " Retract" | ||||
| 	#define MSG_MOVE_AXIS        " Achsen bewegen\x7E" | ||||
| 	#define MSG_SPEED            " Geschw:" | ||||
| 	#define MSG_NOZZLE           " \002Düse:" | ||||
| 	#define MSG_NOZZLE1          " \002Düse2:" | ||||
| 	#define MSG_NOZZLE2          " \002Düse3:" | ||||
| 	#define MSG_BED              " \002Bett:" | ||||
| 	#define MSG_FAN_SPEED        " Lüftergeschw.:" | ||||
| 	#define MSG_FLOW             " Fluß:" | ||||
| 	#define MSG_CONTROL          " Einstellungen \003" | ||||
| 	#define MSG_MIN              " \002 Min:" | ||||
| 	#define MSG_MAX              " \002 Max:" | ||||
| 	#define MSG_FACTOR           " \002 Faktor:" | ||||
| 	#define MSG_AUTOTEMP         " AutoTemp:" | ||||
| 	#define MSG_ON               "Ein " | ||||
| 	#define MSG_OFF              "Aus " | ||||
| 	#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-jerk: " | ||||
| 	#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-Retract:" | ||||
| 	#define MSG_XSTEPS           " Xsteps/mm:" | ||||
| 	#define MSG_YSTEPS           " Ysteps/mm:" | ||||
| 	#define MSG_ZSTEPS           " Zsteps/mm:" | ||||
| 	#define MSG_ESTEPS           " Esteps/mm:" | ||||
| 	#define MSG_MAIN_WIDE        " Hauptmenü     \003" | ||||
| 	#define MSG_RECTRACT_WIDE    " Rectract      \x7E" | ||||
| 	#define MSG_WATCH            " Beobachten    \003" | ||||
| 	#define MSG_TEMPERATURE_WIDE " Temperatur    \x7E" | ||||
| 	#define MSG_MOTION_WIDE      " Bewegung      \x7E" | ||||
| 	#define MSG_STORE_EPROM      " EPROM speichern" | ||||
| 	#define MSG_LOAD_EPROM       " EPROM laden" | ||||
| 	#define MSG_RESTORE_FAILSAFE " Standardkonfig." | ||||
| 	#define MSG_REFRESH          "\004Aktualisieren" | ||||
| 	#define MSG_PREPARE          " Vorbereitung  \x7E" | ||||
| 	#define MSG_PREPARE_ALT      " Vorbereitung  \003" | ||||
| 	#define MSG_CONTROL_ARROW    " Einstellungen \x7E" | ||||
| 	#define MSG_TUNE             " Justierung    \x7E" | ||||
| 	#define MSG_PAUSE_PRINT      " Druck anhalten\x7E" | ||||
| 	#define MSG_RESUME_PRINT     " Druck fortsetz\x7E" | ||||
| 	#define MSG_STOP_PRINT       " Druck stoppen \x7E" | ||||
| 	#define MSG_CARD_MENU        " SDKarten Menü \x7E" | ||||
| 	#define MSG_NO_CARD          " Keine SDKarte" | ||||
| 	#define MSG_DWELL            "Warten..."		 | ||||
| 	#define MSG_USERWAIT         "Warte auf Nutzer..." | ||||
| 	#define MSG_NO_MOVE          "Kein Zug." | ||||
| 	#define MSG_PART_RELEASE     "Stepper tlw frei" | ||||
| 	#define MSG_KILLED           "KILLED" | ||||
| 	#define MSG_STOPPED          "GESTOPPT" | ||||
| 	#define MSG_STEPPER_RELEASED "Stepper frei" | ||||
|         #define MSG_CONTROL_RETRACT  " Retract mm:" | ||||
|         #define MSG_CONTROL_RETRACTF " Retract  F:" | ||||
|         #define MSG_CONTROL_RETRACT_ZLIFT " Hop mm:" | ||||
|         #define MSG_CONTROL_RETRACT_RECOVER " UnRet +mm:" | ||||
|         #define MSG_CONTROL_RETRACT_RECOVERF " UnRet  F:" | ||||
|         #define MSG_AUTORETRACT      " AutoRetr.:" | ||||
| 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Fehler in Menüstruktur." | ||||
| 	 | ||||
| 	#define MSG_TUNE " Tune    \x7E" | ||||
| 	#define MSG_STOP_PRINT " Druck stoppen   \x7E" | ||||
| 	#define MSG_CARD_MENU " SDKarten Menue    \x7E" | ||||
| 	#define MSG_NO_CARD " Keine SDKarte" | ||||
| 	#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Fehler in der  Menuestruktur." | ||||
| 	#define MSG_DWELL "DWELL..."		 | ||||
| 	#define MSG_NO_MOVE "No move." | ||||
| 	#define MSG_PART_RELEASE "Partial Release" | ||||
| 	#define MSG_KILLED "KILLED. " | ||||
| 	#define MSG_STOPPED "STOPPED. " | ||||
| 	#define MSG_PREHEAT_PLA " Preheat PLA" | ||||
| 	#define MSG_PREHEAT_ABS " Preheat ABS" | ||||
| 	#define MSG_STEPPER_RELEASED "Released." | ||||
| 	 | ||||
|  | ||||
|  | ||||
| // Serial Console Messages | ||||
|  | ||||
| 	#define MSG_Enqueing "enqueing \"" | ||||
| @@ -340,6 +346,7 @@ | ||||
| #define MSG_SET_ORIGIN " Establecer Cero" | ||||
| #define MSG_COOLDOWN " Enfriar" | ||||
| #define MSG_EXTRUDE " Extruir" | ||||
| #define MSG_RETRACT " Retract" | ||||
| #define MSG_PREHEAT_PLA " Precalentar PLA" | ||||
| #define MSG_PREHEAT_ABS " Precalentar ABS" | ||||
| #define MSG_MOVE_AXIS " Mover Ejes      \x7E" | ||||
| @@ -390,6 +397,8 @@ | ||||
| #define MSG_CONTROL_ARROW " Control  \x7E" | ||||
| #define MSG_RETRACT_ARROW " Control  \x7E" | ||||
| #define MSG_TUNE " Ajustar \x7E" | ||||
| #define MSG_PAUSE_PRINT " Pause Print \x7E" | ||||
| #define MSG_RESUME_PRINT " Resume Print \x7E" | ||||
| #define MSG_STOP_PRINT " Detener Impresion \x7E" | ||||
| #define MSG_CARD_MENU " Menu de SD    \x7E" | ||||
| #define MSG_NO_CARD " No hay Tarjeta SD" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user