From 0780146034b02c77a0950d354c1614750510a1ba Mon Sep 17 00:00:00 2001 From: esenapaj Date: Mon, 10 Oct 2016 01:17:46 +0900 Subject: [PATCH 1/2] Move DAC section from inside of the changing filament section --- Marlin/language_en.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index cfad8960d0..648cee6c9a 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -532,6 +532,15 @@ #define MSG_INFO_PSU "Power Supply" #endif +#ifndef MSG_DRIVE_STRENGTH + #define MSG_DRIVE_STRENGTH "Drive Strength" +#endif +#ifndef MSG_DAC_PERCENT + #define MSG_DAC_PERCENT "Driver %" +#endif +#ifndef MSG_DAC_EEPROM_WRITE + #define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write" +#endif #ifndef MSG_FILAMENT_CHANGE_HEADER #define MSG_FILAMENT_CHANGE_HEADER "CHANGE FILAMENT" #endif @@ -544,15 +553,6 @@ #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME #define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print" #endif -#ifndef MSG_DRIVE_STRENGTH - #define MSG_DRIVE_STRENGTH "Drive Strength" -#endif -#ifndef MSG_DAC_PERCENT - #define MSG_DAC_PERCENT "Driver %" -#endif -#ifndef MSG_DAC_EEPROM_WRITE - #define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write" -#endif #if LCD_HEIGHT >= 4 #ifndef MSG_FILAMENT_CHANGE_INIT_1 #define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start" From b27080c1dd05ccc000269f8567ee2b5e1a7c610e Mon Sep 17 00:00:00 2001 From: esenapaj Date: Mon, 10 Oct 2016 01:50:15 +0900 Subject: [PATCH 2/2] Update Japanese translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Add new translation --- Marlin/language_kana.h | 7 +++++++ Marlin/language_kana_utf8.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index ba6098e3d8..03c7331109 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -255,6 +255,13 @@ #else #define MSG_INFO_PSU "\xc3\xde\xdd\xb9\xde\xdd" // "ﾃﾞﾝｹﾞﾝ" ("Power Supply") #endif +#define MSG_DRIVE_STRENGTH "\xd3\xb0\xc0\xb0\xb8\xc4\xde\xb3\xd8\xae\xb8" // "ﾓｰﾀｰｸﾄﾞｳﾘｮｸ" ("Drive Strength") +#if LCD_WIDTH > 19 + #define MSG_DAC_PERCENT "DAC\xbc\xad\xc2\xd8\xae\xb8 %" // "DACｼｭﾂﾘｮｸ %" ("Driver %") +#else + #define MSG_DAC_PERCENT "DAC\xbc\xad\xc2\xd8\xae\xb8" // "DACｼｭﾂﾘｮｸ" ("Driver %") +#endif +#define MSG_DAC_EEPROM_WRITE MSG_STORE_EPROM // "ﾒﾓﾘﾍｶｸﾉｳ" ("DAC EEPROM Write") #define MSG_FILAMENT_CHANGE_HEADER "\xcc\xa8\xd7\xd2\xdd\xc4\xba\xb3\xb6\xdd" // "ﾌｨﾗﾒﾝﾄｺｳｶﾝ" ("CHANGE FILAMENT") #define MSG_FILAMENT_CHANGE_OPTION_HEADER "\xc4\xde\xb3\xbb\xa6\xbe\xdd\xc0\xb8\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ﾄﾞｳｻｦｾﾝﾀｸｼﾃｸﾀﾞｻｲ" ("CHANGE OPTIONS:") #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "\xbb\xd7\xc6\xb5\xbc\xc0\xde\xbd" // "ｻﾗﾆｵｼﾀﾞｽ" ("Extrude more") diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 15712fd8c1..2d6405975c 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -198,6 +198,9 @@ #define MSG_INFO_MIN_TEMP "セッテイサイテイオン" // "Min Temp" #define MSG_INFO_MAX_TEMP "セッテイサイコウオン" // "Max Temp" #define MSG_INFO_PSU "デンゲンシュベツ" // "Power Supply" +#define MSG_DRIVE_STRENGTH "モータークドウリョク" // "Drive Strength" +#define MSG_DAC_PERCENT "DACシュツリョク %" // "Driver %" +#define MSG_DAC_EEPROM_WRITE MSG_STORE_EPROM // "DAC EEPROM Write" #define MSG_FILAMENT_CHANGE_HEADER "フィラメントコウカン" // "CHANGE FILAMENT" #define MSG_FILAMENT_CHANGE_OPTION_HEADER "ドウサヲセンタクシテクダサイ" // "CHANGE OPTIONS:" #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "サラニオシダス" // "Extrude more"