From aaccea0260b05099575fabfeb32a2a1dc030261d Mon Sep 17 00:00:00 2001 From: AnHardt Date: Mon, 27 Jul 2015 02:55:59 +0200 Subject: [PATCH] Shift some display only strings from language.h to lenguage_en.h and translate them to German. --- Marlin/language.h | 4 ---- Marlin/language_de.h | 4 ++++ Marlin/language_en.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 1405252700..ad04474291 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -123,10 +123,6 @@ #define MSG_INVALID_EXTRUDER "Invalid extruder" #define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_HEATING "Heating..." -#define MSG_HEATING_COMPLETE "Heating done." -#define MSG_BED_HEATING "Bed Heating." -#define MSG_BED_DONE "Bed done." #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Printer halted. kill() called!" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 57db43f245..d8bdbf4904 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -124,6 +124,10 @@ #define MSG_ENDSTOP_ABORT "Endstop Abbr. Ein" #define MSG_END_HOUR "Stunden" #define MSG_END_MINUTE "Minuten" +#define MSG_HEATING "Aufheizen..." +#define MSG_HEATING_COMPLETE "Aufgeheizt" +#define MSG_BED_HEATING "Bett aufheizen" +#define MSG_BED_DONE "Bett aufgeheizt" #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta kalibrieren" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index f2ca91beee..7ad4a7fcd8 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -420,6 +420,18 @@ #ifndef MSG_END_MINUTE #define MSG_END_MINUTE "minutes" #endif +#ifndef MSG_HEATING +#define MSG_HEATING "Heating..." +#endif +#ifndef MSG_HEATING +#define MSG_HEATING_COMPLETE "Heating done." +#endif +#ifndef MSG_HEATING +#define MSG_BED_HEATING "Bed Heating." +#endif +#ifndef MSG_HEATING +#define MSG_BED_DONE "Bed done." +#endif #ifdef DELTA_CALIBRATION_MENU #ifndef MSG_DELTA_CALIBRATE