From b60761bcff7705e1102ccab523a480e141751069 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Wed, 11 Mar 2015 10:30:38 +0100 Subject: [PATCH] Removed some messages that shouldn't be translated in the Japanese files. And made falback to kana work. --- Marlin/language_kana.h | 3 +++ Marlin/language_kana_utf8.h | 6 ------ Marlin/language_kanji.h | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 050ebd5c5b..8c8ecdb871 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -124,11 +124,14 @@ #define MSG_BABYSTEP_Z "\xcb\xde\xc4\xde\xb3 Z" // "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" +/* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h #define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3..." // "Heating..." #define MSG_HEATING_COMPLETE "\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3" // "Heating done." #define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xc1\xad\xb3" // "Bed Heating." #define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3" // "Bed done." #define MSG_ENDSTOPS_HIT "endstops hit: " + ^ typho +*/ #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 9b74986f8e..d364a0332f 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -128,12 +128,6 @@ #define MSG_BABYSTEP_Z "ヒ゛ト゛ウ Z" // "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" -#define MSG_HEATING "セネシチユウ..." // "Heating..." -#define MSG_HEATING_COMPLETE "セネシセンリxョウ" // "Heating done." -#define MSG_BED_HEATING "ヘ゛ツト゛セネシチユウ" // "Bed Heating." 5C 33 34 33 -#define MSG_BED_DONE "ヘ゛ツト゛セネシセンリxョウ" // "Bed done." -#define MSG_ENDSTOPS_HIT "endstops hit: " - #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE_X "Calibrate X" diff --git a/Marlin/language_kanji.h b/Marlin/language_kanji.h index d2e8546912..15b8359ab0 100644 --- a/Marlin/language_kanji.h +++ b/Marlin/language_kanji.h @@ -5,6 +5,7 @@ * Please note these are limited to 17 characters! * */ +#include "Configuration.h" #ifndef DOGLCD #include "language_kana.h" // fallback to kana #define LANGUAGE_KANJI_H @@ -130,11 +131,15 @@ #define MSG_BABYSTEP_Y "\xcb\xde\xc4\xde\xb3 Y" // "Babystep Y" #define MSG_BABYSTEP_Z "\xcb\xde\xc4\xde\xb3 Z" // "Babystep Z" #define MSG_ENDSTOP_ABORT "Endstop abort" + +/* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h #define MSG_HEATING "\xb6\xe5\x94\x95\x89..." // "Heating..." #define MSG_HEATING_COMPLETE "\xb6\xe5\x94\x95\xa4\xa5\x7f" // "Heating done." #define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\x89" // "Bed Heating." #define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\xa4\xa5\x7f" // "Bed done." #define MSG_ENDSTOPS_HIT "endstops hit: " + ^ typho +*/ #ifdef DELTA_CALIBRATION_MENU #define MSG_DELTA_CALIBRATE "Delta Calibration"