From 00cdb15cec062d1596fc05e2ef74424ea949f830 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 18 Aug 2016 21:00:44 -0500 Subject: [PATCH] Move invariant LCD strings to language.h --- Marlin/language.h | 26 ++++++++++++++++++++++++++ Marlin/language_en.h | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 052cfe8568..e6c1b8efd5 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -244,6 +244,32 @@ #define LANGUAGE_INCL(M) LANGUAGE_INCL_(M) #define INCLUDE_LANGUAGE LANGUAGE_INCL(LCD_LANGUAGE) +// Never translate these strings +#define MSG_X "X" +#define MSG_Y "Y" +#define MSG_Z "Z" +#define MSG_E "E" +#define MSG_H1 "1" +#define MSG_H2 "2" +#define MSG_H3 "3" +#define MSG_H4 "4" +#define MSG_N1 " 1" +#define MSG_N2 " 2" +#define MSG_N3 " 3" +#define MSG_N4 " 4" +#define MSG_E1 " E1" +#define MSG_E2 " E2" +#define MSG_E3 " E3" +#define MSG_E4 " E4" +#define MSG_MOVE_E1 "1" +#define MSG_MOVE_E2 "2" +#define MSG_MOVE_E3 "3" +#define MSG_MOVE_E4 "4" +#define MSG_DIAM_E1 " 1" +#define MSG_DIAM_E2 " 2" +#define MSG_DIAM_E3 " 3" +#define MSG_DIAM_E4 " 4" + #include INCLUDE_LANGUAGE #if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_GREEK) && DISABLED(DISPLAY_CHARSET_ISO10646_CN) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 560c44ba6a..a0443f4d58 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -608,30 +608,4 @@ #endif #endif // LCD_HEIGHT < 4 -// Never translate these strings -#define MSG_X "X" -#define MSG_Y "Y" -#define MSG_Z "Z" -#define MSG_E "E" -#define MSG_H1 "1" -#define MSG_H2 "2" -#define MSG_H3 "3" -#define MSG_H4 "4" -#define MSG_N1 " 1" -#define MSG_N2 " 2" -#define MSG_N3 " 3" -#define MSG_N4 " 4" -#define MSG_E1 " E1" -#define MSG_E2 " E2" -#define MSG_E3 " E3" -#define MSG_E4 " E4" -#define MSG_MOVE_E1 "1" -#define MSG_MOVE_E2 "2" -#define MSG_MOVE_E3 "3" -#define MSG_MOVE_E4 "4" -#define MSG_DIAM_E1 " 1" -#define MSG_DIAM_E2 " 2" -#define MSG_DIAM_E3 " 3" -#define MSG_DIAM_E4 " 4" - #endif // LANGUAGE_EN_H