From 2c892fca6a5bf4ca6881c5fd4fdfb41e7c91a567 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 May 2015 21:38:32 -0700 Subject: [PATCH] Cleanup of language.h --- Marlin/configurator/config/language.h | 17 +++++++++-------- Marlin/language.h | 16 ++++++++-------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index a56ee522f8..02235aac70 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -30,6 +30,7 @@ // eu Basque-Euskera // kana Japanese // kana_utf Japanese +// cn Chinese #ifndef LANGUAGE_INCLUDE // pick your language from the list above @@ -130,13 +131,15 @@ #define MSG_FILE_PRINTED "Done printing file" #define MSG_BEGIN_FILE_LIST "Begin file list" #define MSG_END_FILE_LIST "End file list" -#define MSG_M104_INVALID_EXTRUDER "M104 Invalid extruder " -#define MSG_M105_INVALID_EXTRUDER "M105 Invalid extruder " -#define MSG_M200_INVALID_EXTRUDER "M200 Invalid extruder " -#define MSG_M218_INVALID_EXTRUDER "M218 Invalid extruder " -#define MSG_M221_INVALID_EXTRUDER "M221 Invalid extruder " +#define MSG_INVALID_EXTRUDER "Invalid extruder" +#define MSG_INVALID_SOLENOID "Invalid solenoid" +#define MSG_M104_INVALID_EXTRUDER "M104 " MSG_INVALID_EXTRUDER " " +#define MSG_M105_INVALID_EXTRUDER "M105 " MSG_INVALID_EXTRUDER " " +#define MSG_M109_INVALID_EXTRUDER "M109 " MSG_INVALID_EXTRUDER " " +#define MSG_M200_INVALID_EXTRUDER "M200 " MSG_INVALID_EXTRUDER " " +#define MSG_M218_INVALID_EXTRUDER "M218 " MSG_INVALID_EXTRUDER " " +#define MSG_M221_INVALID_EXTRUDER "M221 " MSG_INVALID_EXTRUDER " " #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_M109_INVALID_EXTRUDER "M109 Invalid extruder " #define MSG_HEATING "Heating..." #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." @@ -148,8 +151,6 @@ #define MSG_RESEND "Resend: " #define MSG_UNKNOWN_COMMAND "Unknown command: \"" #define MSG_ACTIVE_EXTRUDER "Active Extruder: " -#define MSG_INVALID_EXTRUDER "Invalid extruder" -#define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_X_MIN "x_min: " #define MSG_X_MAX "x_max: " #define MSG_Y_MIN "y_min: " diff --git a/Marlin/language.h b/Marlin/language.h index 02cd675c8b..02235aac70 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -131,13 +131,15 @@ #define MSG_FILE_PRINTED "Done printing file" #define MSG_BEGIN_FILE_LIST "Begin file list" #define MSG_END_FILE_LIST "End file list" -#define MSG_M104_INVALID_EXTRUDER "M104 Invalid extruder " -#define MSG_M105_INVALID_EXTRUDER "M105 Invalid extruder " -#define MSG_M200_INVALID_EXTRUDER "M200 Invalid extruder " -#define MSG_M218_INVALID_EXTRUDER "M218 Invalid extruder " -#define MSG_M221_INVALID_EXTRUDER "M221 Invalid extruder " +#define MSG_INVALID_EXTRUDER "Invalid extruder" +#define MSG_INVALID_SOLENOID "Invalid solenoid" +#define MSG_M104_INVALID_EXTRUDER "M104 " MSG_INVALID_EXTRUDER " " +#define MSG_M105_INVALID_EXTRUDER "M105 " MSG_INVALID_EXTRUDER " " +#define MSG_M109_INVALID_EXTRUDER "M109 " MSG_INVALID_EXTRUDER " " +#define MSG_M200_INVALID_EXTRUDER "M200 " MSG_INVALID_EXTRUDER " " +#define MSG_M218_INVALID_EXTRUDER "M218 " MSG_INVALID_EXTRUDER " " +#define MSG_M221_INVALID_EXTRUDER "M221 " MSG_INVALID_EXTRUDER " " #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" -#define MSG_M109_INVALID_EXTRUDER "M109 Invalid extruder " #define MSG_HEATING "Heating..." #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." @@ -149,8 +151,6 @@ #define MSG_RESEND "Resend: " #define MSG_UNKNOWN_COMMAND "Unknown command: \"" #define MSG_ACTIVE_EXTRUDER "Active Extruder: " -#define MSG_INVALID_EXTRUDER "Invalid extruder" -#define MSG_INVALID_SOLENOID "Invalid solenoid" #define MSG_X_MIN "x_min: " #define MSG_X_MAX "x_max: " #define MSG_Y_MIN "y_min: "