Browse Source

Removed some messages that shouldn't be translated in the Japanese files.

And made falback to kana work.
AnHardt 10 years ago
parent
commit
b60761bcff
3 changed files with 8 additions and 6 deletions
  1. 3
    0
      Marlin/language_kana.h
  2. 0
    6
      Marlin/language_kana_utf8.h
  3. 5
    0
      Marlin/language_kanji.h

+ 3
- 0
Marlin/language_kana.h View File

124
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
124
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
125
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
126
 
126
 
127
+/* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h
127
 #define MSG_HEATING                         "\xb6\xc8\xc2\xc1\xad\xb3..."                                  // "Heating..."
128
 #define MSG_HEATING                         "\xb6\xc8\xc2\xc1\xad\xb3..."                                  // "Heating..."
128
 #define MSG_HEATING_COMPLETE                "\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3"                            // "Heating done."
129
 #define MSG_HEATING_COMPLETE                "\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3"                            // "Heating done."
129
 #define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xc1\xad\xb3"                 // "Bed Heating."
130
 #define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xc1\xad\xb3"                 // "Bed Heating."
130
 #define MSG_BED_DONE                        "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3"        // "Bed done."
131
 #define MSG_BED_DONE                        "\xcd\xde\xaf\xc4\xde\xb6\xc8\xc2\xb6\xdd\xd8x\xae\xb3"        // "Bed done."
131
 #define MSG_ENDSTOPS_HIT                    "endstops hit: "
132
 #define MSG_ENDSTOPS_HIT                    "endstops hit: "
133
+                   ^ typho
134
+*/
132
 
135
 
133
 #ifdef DELTA_CALIBRATION_MENU
136
 #ifdef DELTA_CALIBRATION_MENU
134
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
137
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

+ 0
- 6
Marlin/language_kana_utf8.h View File

128
 #define MSG_BABYSTEP_Z                      "ヒ゛ト゛ウ Z"                    // "Babystep Z"
128
 #define MSG_BABYSTEP_Z                      "ヒ゛ト゛ウ Z"                    // "Babystep Z"
129
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
129
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
130
 
130
 
131
-#define MSG_HEATING                         "セネシチユウ..."                // "Heating..."
132
-#define MSG_HEATING_COMPLETE                "セネシセンリxョウ"                // "Heating done."
133
-#define MSG_BED_HEATING                     "ヘ゛ツト゛セネシチユウ"             // "Bed Heating."  5C 33 34 33
134
-#define MSG_BED_DONE                        "ヘ゛ツト゛セネシセンリxョウ"           // "Bed done."
135
-#define MSG_ENDSTOPS_HIT                    "endstops hit: "
136
-
137
 #ifdef DELTA_CALIBRATION_MENU
131
 #ifdef DELTA_CALIBRATION_MENU
138
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
132
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
139
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
133
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 5
- 0
Marlin/language_kanji.h View File

5
  * Please note these are limited to 17 characters!
5
  * Please note these are limited to 17 characters!
6
  *
6
  *
7
  */
7
  */
8
+#include "Configuration.h" 
8
 #ifndef DOGLCD
9
 #ifndef DOGLCD
9
   #include "language_kana.h" // fallback to kana
10
   #include "language_kana.h" // fallback to kana
10
   #define LANGUAGE_KANJI_H
11
   #define LANGUAGE_KANJI_H
130
 #define MSG_BABYSTEP_Y                      "\xcb\xde\xc4\xde\xb3 Y"                                       // "Babystep Y"
131
 #define MSG_BABYSTEP_Y                      "\xcb\xde\xc4\xde\xb3 Y"                                       // "Babystep Y"
131
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
132
 #define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
132
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
133
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
134
+
135
+/* These are from language.h. PLEASE DON'T TRANSLATE!  All translatable messages can be found in language_en.h
133
 #define MSG_HEATING                         "\xb6\xe5\x94\x95\x89..."                                      // "Heating..."
136
 #define MSG_HEATING                         "\xb6\xe5\x94\x95\x89..."                                      // "Heating..."
134
 #define MSG_HEATING_COMPLETE                "\xb6\xe5\x94\x95\xa4\xa5\x7f"                                 // "Heating done."
137
 #define MSG_HEATING_COMPLETE                "\xb6\xe5\x94\x95\xa4\xa5\x7f"                                 // "Heating done."
135
 #define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\x89"                     // "Bed Heating."
138
 #define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\x89"                     // "Bed Heating."
136
 #define MSG_BED_DONE                        "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\xa4\xa5\x7f"             // "Bed done."
139
 #define MSG_BED_DONE                        "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\xa4\xa5\x7f"             // "Bed done."
137
 #define MSG_ENDSTOPS_HIT                    "endstops hit: "
140
 #define MSG_ENDSTOPS_HIT                    "endstops hit: "
141
+                   ^ typho
142
+*/
138
 
143
 
139
 #ifdef DELTA_CALIBRATION_MENU
144
 #ifdef DELTA_CALIBRATION_MENU
140
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
145
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"

Loading…
Cancel
Save