diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 81c020ac9..8dee6aa2f 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -57,14 +57,14 @@ #define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "ｷｼﾞｭﾝｾｯﾄ" ("Set origin") #define MSG_PREHEAT_1 "PLA \xd6\xc8\xc2" // "PLA ﾖﾈﾂ" ("Preheat PLA") #define MSG_PREHEAT_1_N MSG_PREHEAT_1 " " -#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All") -#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed") -#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf") +#define MSG_PREHEAT_1_ALL "PLA \xbd\xcd\xde\xc3\xd6\xc8\xc2" // "PLA ｽﾍﾞﾃﾖﾈﾂ" (" All") +#define MSG_PREHEAT_1_BEDONLY "PLA \xcd\xde\xaf\xc4\xde\xd6\xc8\xc2" // "PLA ﾍﾞｯﾄﾞﾖﾈﾂ" (" Bed") +#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "\xbe\xaf\xc3\xb2" // "ｾｯﾃｲ" (" conf") #define MSG_PREHEAT_2 "ABS \xd6\xc8\xc2" // "ABS ﾖﾈﾂ" ("Preheat ABS") #define MSG_PREHEAT_2_N MSG_PREHEAT_2 " " -#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All") -#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed") -#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf") +#define MSG_PREHEAT_2_ALL "ABS \xbd\xcd\xde\xc3\xd6\xc8\xc2" // "ABS ｽﾍﾞﾃﾖﾈﾂ" (" All") +#define MSG_PREHEAT_2_BEDONLY "ABS \xcd\xde\xaf\xc4\xde\xd6\xc8\xc2" // "ABS ﾍﾞｯﾄﾞﾖﾈﾂ" (" Bed") +#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 "\xbe\xaf\xc3\xb2" // "ｾｯﾃｲ" (" conf") #define MSG_COOLDOWN "\xb6\xc8\xc2\xc3\xb2\xbc" // "ｶﾈﾂﾃｲｼ" ("Cooldown") #define MSG_SWITCH_PS_ON "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xdd" // "ﾃﾞﾝｹﾞﾝ ｵﾝ" ("Switch power on") #define MSG_SWITCH_PS_OFF "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "ﾃﾞﾝｹﾞﾝ ｵﾌ" ("Switch power off") @@ -89,10 +89,10 @@ #define MSG_MIN LCD_STR_THERMOMETER " \xbb\xb2\xc3\xb2" // " ｻｲﾃｲ" (" Min") #define MSG_MAX LCD_STR_THERMOMETER " \xbb\xb2\xba\xb3" // " ｻｲｺｳ" (" Max") #define MSG_FACTOR LCD_STR_THERMOMETER " \xcc\xa7\xb8\xc0\xb0" // " ﾌｧｸﾀｰ" (" Fact") -#if LCD_WIDTH < 20 - #define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde" // "ｼﾞﾄﾞｳｵﾝﾄﾞ" ("Autotemp") -#else +#if LCD_WIDTH > 19 #define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde\xbe\xb2\xb7\xde\xae" // "ｼﾞﾄﾞｳｵﾝﾄﾞｾｲｷﾞｮ" ("Autotemp") +#else + #define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde" // "ｼﾞﾄﾞｳｵﾝﾄﾞ" ("Autotemp") #endif #define MSG_ON "\xb5\xdd " // "ｵﾝ " ("On ") #define MSG_OFF "\xb5\xcc " // "ｵﾌ " ("Off") @@ -100,31 +100,31 @@ #define MSG_PID_I "PID-I" #define MSG_PID_D "PID-D" #define MSG_PID_C "PID-C" -#if LCD_WIDTH < 20 - #define MSG_ACC "\xb6\xbf\xb8\xc4\xde" // "ｶｿｸﾄﾞ" ("Accel") - #define MSG_VXY_JERK "XY\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "XYｼﾞｸ ﾔｸﾄﾞ" ("Vxy-jerk") - #define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "Zｼﾞｸ ﾔｸﾄﾞ" ("Vz-jerk") - #define MSG_VE_JERK "E\x20\xd4\xb8\xc4\xde" // "E ﾔｸﾄﾞ" ("Ve-jerk") - #define MSG_VMAX "max\xb5\xb8\xd8\xbf\xb8\xc4\xde " // "maxｵｸﾘｿｸﾄﾞ" ("Vmax ") -#else +#if LCD_WIDTH > 19 #define MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" // "ｶｿｸﾄﾞ mm/s2" ("Accel") #define MSG_VXY_JERK "XY\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "XYｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vxy-jerk") #define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "Zｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vz-jerk") #define MSG_VE_JERK "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0\x20\xd4\xb8\xc4\xde" // "ｴｸｽﾄﾙｰﾀﾞｰ ﾔｸﾄﾞ" ("Ve-jerk") #define MSG_VMAX "\xbb\xb2\xc0\xde\xb2\xb5\xb8\xd8\xbf\xb8\xc4\xde " // "ｻｲﾀﾞｲｵｸﾘｿｸﾄﾞ " ("Vmax ") +#else + #define MSG_ACC "\xb6\xbf\xb8\xc4\xde" // "ｶｿｸﾄﾞ" ("Accel") + #define MSG_VXY_JERK "XY\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "XYｼﾞｸ ﾔｸﾄﾞ" ("Vxy-jerk") + #define MSG_VZ_JERK "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde" // "Zｼﾞｸ ﾔｸﾄﾞ" ("Vz-jerk") + #define MSG_VE_JERK "E\x20\xd4\xb8\xc4\xde" // "E ﾔｸﾄﾞ" ("Ve-jerk") + #define MSG_VMAX "max\xb5\xb8\xd8\xbf\xb8\xc4\xde " // "maxｵｸﾘｿｸﾄﾞ" ("Vmax ") #endif #define MSG_X "X" #define MSG_Y "Y" #define MSG_Z "Z" #define MSG_E "E" -#if LCD_WIDTH < 20 - #define MSG_VMIN "min\xb5\xb8\xd8\xbf\xb8\xc4\xde" // "minｵｸﾘｿｸﾄﾞ" ("Vmin") - #define MSG_VTRAV_MIN "min\xb2\xc4\xde\xb3\xbf\xb8\xc4\xde" // "minｲﾄﾞｳｿｸﾄﾞ" ("VTrav min") - #define MSG_AMAX "max\xb6\xbf\xb8 " // "maxｶｿｸ " ("Amax ") -#else +#if LCD_WIDTH > 19 #define MSG_VMIN "\xbb\xb2\xbc\xae\xb3\xb5\xb8\xd8\xbf\xb8\xc4\xde" // "ｻｲｼｮｳｵｸﾘｿｸﾄﾞ" ("Vmin") #define MSG_VTRAV_MIN "\xbb\xb2\xbc\xae\xb3\xb2\xc4\xde\xb3\xbf\xb8\xc4\xde" // "ｻｲｼｮｳｲﾄﾞｳｿｸﾄﾞ" ("VTrav min") #define MSG_AMAX "\xbb\xb2\xc0\xde\xb2\xb6\xbf\xb8\xc4\xde " // "ｻｲﾀﾞｲｶｿｸﾄﾞ " ("Amax ") +#else + #define MSG_VMIN "min\xb5\xb8\xd8\xbf\xb8\xc4\xde" // "minｵｸﾘｿｸﾄﾞ" ("Vmin") + #define MSG_VTRAV_MIN "min\xb2\xc4\xde\xb3\xbf\xb8\xc4\xde" // "minｲﾄﾞｳｿｸﾄﾞ" ("VTrav min") + #define MSG_AMAX "max\xb6\xbf\xb8 " // "maxｶｿｸ " ("Amax ") #endif #define MSG_A_RETRACT "\xcb\xb7\xba\xd0\xb6\xbf\xb8\xc4\xde" // "ﾋｷｺﾐｶｿｸﾄﾞ" ("A-retract") #define MSG_A_TRAVEL "\xb2\xc4\xde\xb3\xb6\xbf\xb8\xc4\xde" // "ｲﾄﾞｳｶｿｸﾄﾞ" ("A-travel") @@ -136,10 +136,10 @@ #define MSG_MOTION "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2" // "ｳｺﾞｷｾｯﾃｲ" ("Motion") #define MSG_VOLUMETRIC "\xcc\xa8\xd7\xd2\xdd\xc4" // "ﾌｨﾗﾒﾝﾄ" ("Filament") #define MSG_VOLUMETRIC_ENABLED "E in mm3" -#if LCD_WIDTH < 20 - #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xb9\xb2" // "ﾌｨﾗﾒﾝﾄｹｲ" ("Fil. Dia.") -#else +#if LCD_WIDTH > 19 #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xc1\xae\xaf\xb9\xb2" // "ﾌｨﾗﾒﾝﾄﾁｮｯｹｲ" ("Fil. Dia.") +#else + #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xb9\xb2" // "ﾌｨﾗﾒﾝﾄｹｲ" ("Fil. Dia.") #endif #define MSG_CONTRAST "LCD\xba\xdd\xc4\xd7\xbd\xc4" // "LCDｺﾝﾄﾗｽﾄ" ("LCD contrast") #define MSG_STORE_EPROM "\xd2\xd3\xd8\xcd\xb6\xb8\xc9\xb3" // "ﾒﾓﾘﾍｶｸﾉｳ" ("Store memory") @@ -161,15 +161,7 @@ #define MSG_NO_MOVE "\xb3\xba\xde\xb7\xcf\xbe\xdd" // "ｳｺﾞｷﾏｾﾝ" ("No move.") #define MSG_KILLED "\xcb\xbc\xde\xae\xb3\xc3\xb2\xbc" // "ﾋｼﾞｮｳﾃｲｼ" ("KILLED. ") #define MSG_STOPPED "\xc3\xb2\xbc\xbc\xcf\xbc\xc0" // "ﾃｲｼｼﾏｼﾀ" ("STOPPED. ") -#if LCD_WIDTH < 20 - #define MSG_CONTROL_RETRACT "\xcb\xb7\xba\xd0\xd8\xae\xb3" // "ﾋｷｺﾐﾘｮｳ" ("Retract mm") - #define MSG_CONTROL_RETRACT_SWAP "\xcb\xb7\xba\xd0\xd8\xae\xb3S" // "ﾋｷｺﾐﾘｮｳS" ("Swap Re.mm") - #define MSG_CONTROL_RETRACTF "\xcb\xb7\xba\xd0\xbf\xb8\xc4\xde" // "ﾋｷｺﾐｿｸﾄﾞ" ("Retract V") - #define MSG_CONTROL_RETRACT_ZLIFT "\xc9\xbd\xde\xd9\xc0\xb2\xcb" // "ﾉｽﾞﾙﾀｲﾋ" ("Hop mm") - #define MSG_CONTROL_RETRACT_RECOVER "\xce\xbc\xae\xb3\xd8\xae\xb3" // "ﾎｼｮｳﾘｮｳ" ("UnRet +mm") - #define MSG_CONTROL_RETRACT_RECOVER_SWAP "\xce\xbc\xae\xb3\xd8\xae\xb3S" // "ﾎｼｮｳﾘｮｳS" ("S UnRet+mm") - #define MSG_CONTROL_RETRACT_RECOVERF "\xce\xbc\xae\xb3\xbf\xb8\xc4\xde" // "ﾎｼｮｳｿｸﾄﾞ" ("UnRet V") -#else +#if LCD_WIDTH > 19 #define MSG_CONTROL_RETRACT "\xcb\xb7\xba\xd0\xd8\xae\xb3 mm" // "ﾋｷｺﾐﾘｮｳ mm" ("Retract mm") #define MSG_CONTROL_RETRACT_SWAP "\xcb\xb7\xba\xd0\xd8\xae\xb3S mm" // "ﾋｷｺﾐﾘｮｳS mm" ("Swap Re.mm") #define MSG_CONTROL_RETRACTF "\xcb\xb7\xba\xd0\xbf\xb8\xc4\xde mm/s" // "ﾋｷｺﾐｿｸﾄﾞ mm/s" ("Retract V") @@ -177,49 +169,57 @@ #define MSG_CONTROL_RETRACT_RECOVER "\xce\xbc\xae\xb3\xd8\xae\xb3 mm" // "ﾎｼｮｳﾘｮｳ mm" ("UnRet +mm") #define MSG_CONTROL_RETRACT_RECOVER_SWAP "\xce\xbc\xae\xb3\xd8\xae\xb3S mm" // "ﾎｼｮｳﾘｮｳS mm" ("S UnRet+mm") #define MSG_CONTROL_RETRACT_RECOVERF "\xce\xbc\xae\xb3\xbf\xb8\xc4\xde mm/s" // "ﾎｼｮｳｿｸﾄﾞ mm/s" ("UnRet V") +#else + #define MSG_CONTROL_RETRACT "\xcb\xb7\xba\xd0\xd8\xae\xb3" // "ﾋｷｺﾐﾘｮｳ" ("Retract mm") + #define MSG_CONTROL_RETRACT_SWAP "\xcb\xb7\xba\xd0\xd8\xae\xb3S" // "ﾋｷｺﾐﾘｮｳS" ("Swap Re.mm") + #define MSG_CONTROL_RETRACTF "\xcb\xb7\xba\xd0\xbf\xb8\xc4\xde" // "ﾋｷｺﾐｿｸﾄﾞ" ("Retract V") + #define MSG_CONTROL_RETRACT_ZLIFT "\xc9\xbd\xde\xd9\xc0\xb2\xcb" // "ﾉｽﾞﾙﾀｲﾋ" ("Hop mm") + #define MSG_CONTROL_RETRACT_RECOVER "\xce\xbc\xae\xb3\xd8\xae\xb3" // "ﾎｼｮｳﾘｮｳ" ("UnRet +mm") + #define MSG_CONTROL_RETRACT_RECOVER_SWAP "\xce\xbc\xae\xb3\xd8\xae\xb3S" // "ﾎｼｮｳﾘｮｳS" ("S UnRet+mm") + #define MSG_CONTROL_RETRACT_RECOVERF "\xce\xbc\xae\xb3\xbf\xb8\xc4\xde" // "ﾎｼｮｳｿｸﾄﾞ" ("UnRet V") #endif #define MSG_AUTORETRACT "\xbc\xde\xc4\xde\xb3\xcb\xb7\xba\xd0" // "ｼﾞﾄﾞｳﾋｷｺﾐ" ("AutoRetr.") #define MSG_FILAMENTCHANGE "\xcc\xa8\xd7\xd2\xdd\xc4\xba\xb3\xb6\xdd" // "ﾌｨﾗﾒﾝﾄｺｳｶﾝ" ("Change filament") #define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0" // "SDｶｰﾄﾞｻｲﾖﾐｺﾐ" ("Init. SD card") #define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd" // "SDｶｰﾄﾞｺｳｶﾝ" ("Change SD card") #define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2" // "Zﾌﾟﾛｰﾌﾞ ﾍﾞｯﾄﾞｶﾞｲ" ("Z probe out. bed") - -#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST -#define MSG_FIRST "first" -/* -#if LCD_WIDTH < 20 - #define MSG_YX_UNHOMED "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xd6" // "ｻｷﾆX/Yｦﾌｯｷｻｾﾖ" ("Home X/Y before Z") - #define MSG_XYZ_UNHOMED "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbe\xd6" // "ｻｷﾆｹﾞﾝﾃﾝﾌｯｷｦｾﾖ" ("Home XYZ first") +#define MSG_HOME "\xbb\xb7\xc6" // "ｻｷﾆ" ("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST +#if LCD_WIDTH > 19 + #define MSG_FIRST "\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2" // "ｦﾌｯｷｻｾﾃｸﾀﾞｻｲ" ("first") #else - #define MSG_YX_UNHOMED "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2" // "ｻｷﾆX/Yｦﾌｯｷｻｾﾃｸﾀﾞｻｲ" ("Home X/Y before Z") - #define MSG_XYZ_UNHOMED "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ｻｷﾆｹﾞﾝﾃﾝﾌｯｷｦｼﾃｸﾀﾞｻｲ" ("Home XYZ first") + #define MSG_FIRST "\xa6\xcc\xaf\xb7\xbb\xbe\xd6" // "ｦﾌｯｷｻｾﾖ" ("first") #endif -*/ #define MSG_ZPROBE_ZOFFSET "Z\xb5\xcc\xbe\xaf\xc4" // "Zｵﾌｾｯﾄ" ("Z Offset") #define MSG_BABYSTEP_X "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Xｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep X") #define MSG_BABYSTEP_Y "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Yｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep Y") #define MSG_BABYSTEP_Z "Z\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Zｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep Z") -#if LCD_WIDTH < 20 - #define MSG_ENDSTOP_ABORT "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1" // "ｲﾄﾞｳｹﾞﾝｶｲｹﾝﾁ" ("Endstop abort") -#else +#if LCD_WIDTH > 19 #define MSG_ENDSTOP_ABORT "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1\xb7\xc9\xb3" // "ｲﾄﾞｳｹﾞﾝｶｲｹﾝﾁｷﾉｳ" ("Endstop abort") +#else + #define MSG_ENDSTOP_ABORT "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1" // "ｲﾄﾞｳｹﾞﾝｶｲｹﾝﾁ" ("Endstop abort") #endif #define MSG_HEATING_FAILED_LCD "\xb6\xc8\xc2\xbc\xaf\xca\xdf\xb2" // "ｶﾈﾂｼｯﾊﾟｲ" ("Heating failed") -#if LCD_WIDTH < 20 - #define MSG_ERR_REDUNDANT_TEMP "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0" // "ｴﾗｰ:ｼﾞｮｳﾁｮｳｻｰﾐｽﾀ" ("Err: REDUNDANT TEMP") -#else +#if LCD_WIDTH > 19 #define MSG_ERR_REDUNDANT_TEMP "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0\xb0\xb7\xc9\xb3" // "ｴﾗｰ:ｼﾞｮｳﾁｮｳｻｰﾐｽﾀｰｷﾉｳ" ("Err: REDUNDANT TEMP") +#else + #define MSG_ERR_REDUNDANT_TEMP "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0" // "ｴﾗｰ:ｼﾞｮｳﾁｮｳｻｰﾐｽﾀ" ("Err: REDUNDANT TEMP") #endif #define MSG_THERMAL_RUNAWAY "\xc8\xc2\xce\xde\xb3\xbf\xb3" // "ﾈﾂﾎﾞｳｿｳ" ("THERMAL RUNAWAY") #define MSG_ERR_MAXTEMP "\xb4\xd7\xb0:\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP") #define MSG_ERR_MINTEMP "\xb4\xd7\xb0:\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd" // "ｴﾗｰ:ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP") -#if LCD_WIDTH < 20 - #define MSG_ERR_MAXTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝ" ("Err: MAXTEMP BED") - #define MSG_ERR_MINTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝ" ("Err: MINTEMP BED") -#else +#if LCD_WIDTH > 19 #define MSG_ERR_MAXTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP BED") #define MSG_ERR_MINTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP BED") +#else + #define MSG_ERR_MAXTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝ" ("Err: MAXTEMP BED") + #define MSG_ERR_MINTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝ" ("Err: MINTEMP BED") #endif +#define MSG_HALTED "\xcc\xdf\xd8\xdd\xc0\xb0\xca\xc3\xb2\xbc\xbc\xcf\xbc\xc0" // "ﾌﾟﾘﾝﾀｰﾊﾃｲｼｼﾏｼﾀ" ("PRINTER HALTED") +#define MSG_PLEASE_RESET "\xd8\xbe\xaf\xc4\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ﾘｾｯﾄｼﾃｸﾀﾞｻｲ" ("Please reset") +#define MSG_SHORT_DAY "d" // One character only +#define MSG_SHORT_HOUR "h" // One character only +#define MSG_SHORT_MINUTE "m" // One character only +#define MSG_PRINT_TIME "\xcc\xdf\xd8\xdd\xc4\xbc\xde\xb6\xdd" // "ﾌﾟﾘﾝﾄｼﾞｶﾝ" ("Print time") #define MSG_HEATING "\xb6\xc8\xc2\xc1\xad\xb3" // "ｶﾈﾂﾁｭｳ" ("Heating...") #define MSG_HEATING_COMPLETE "\xb6\xc8\xc2\xb6\xdd\xd8\xae\xb3" // "ｶﾈﾂｶﾝﾘｮｳ" ("Heating done.") #define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\x20\xb6\xc8\xc2\xc1\xad\xb3" // "ﾍﾞｯﾄﾞ ｶﾈﾂﾁｭｳ" ("Bed Heating.") @@ -229,5 +229,64 @@ #define MSG_DELTA_CALIBRATE_Y "Y\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Yｼﾞｸ ｺｳｾｲ" ("Calibrate Y") #define MSG_DELTA_CALIBRATE_Z "Z\xbc\xde\xb8\x20\xba\xb3\xbe\xb2" // "Zｼﾞｸ ｺｳｾｲ" ("Calibrate Z") #define MSG_DELTA_CALIBRATE_CENTER "\xc1\xad\xb3\xbc\xdd\x20\xba\xb3\xbe\xb2" // "ﾁｭｳｼﾝ ｺｳｾｲ" ("Calibrate Center") +#define MSG_INFO_MENU "\xba\xc9\xcc\xdf\xd8\xdd\xc0\xb0\xc6\xc2\xb2\xc3" // "ｺﾉﾌﾟﾘﾝﾀｰﾆﾂｲﾃ" ("About Printer") +#define MSG_INFO_PRINTER_MENU "\xcc\xdf\xd8\xdd\xc0\xb0\xbc\xde\xae\xb3\xce\xb3" // "ﾌﾟﾘﾝﾀｰｼﾞｮｳﾎｳ" ("Printer Info") +#define MSG_INFO_STATS_MENU "\xcc\xdf\xd8\xdd\xc4\xbc\xde\xae\xb3\xb7\xae\xb3" // "ﾌﾟﾘﾝﾄｼﾞｮｳｷｮｳ" ("Printer Stats") +#define MSG_INFO_BOARD_MENU "\xbe\xb2\xb7\xde\xae\xb9\xb2\xbc\xde\xae\xb3\xce\xb3" // "ｾｲｷﾞｮｹｲｼﾞｮｳﾎｳ" ("Board Info") +#define MSG_INFO_THERMISTOR_MENU "\xbb\xb0\xd0\xbd\xc0\xb0" // "ｻｰﾐｽﾀｰ" ("Thermistors") +#define MSG_INFO_EXTRUDERS "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0\xbd\xb3" // "ｴｸｽﾄﾙｰﾀﾞｰｽｳ" ("Extruders") +#define MSG_INFO_BAUDRATE "\xce\xde\xb0\xda\xb0\xc4" // "ﾎﾞｰﾚｰﾄ" ("Baud") +#define MSG_INFO_PROTOCOL "\xcc\xdf\xdb\xc4\xba\xd9" // "ﾌﾟﾛﾄｺﾙ" ("Protocol") +#if LCD_WIDTH > 19 + #define MSG_INFO_PRINT_COUNT "\xcc\xdf\xd8\xdd\xc4\xbd\xb3 " // "ﾌﾟﾘﾝﾄｽｳ " ("Print Count") + #define MSG_INFO_COMPLETED_PRINTS "\xb6\xdd\xd8\xae\xb3\xbd\xb3 " // "ｶﾝﾘｮｳｽｳ " ("Completed ") + #define MSG_INFO_PRINT_TIME "\xba\xde\xb3\xb9\xb2\xbc\xde\xb6\xdd" // "ｺﾞｳｹｲｼﾞｶﾝ" ("Total Time ") +#else + #define MSG_INFO_PRINT_COUNT "\xcc\xdf\xd8\xdd\xc4\xbd\xb3" // "ﾌﾟﾘﾝﾄｽｳ" ("Print Count") + #define MSG_INFO_COMPLETED_PRINTS "\xb6\xdd\xd8\xae\xb3\xbd\xb3" // "ｶﾝﾘｮｳｽｳ" ("Completed ") + #define MSG_INFO_PRINT_TIME "\xb9\xb2\xb6\xbc\xde\xb6\xdd" // "ｹｲｶｼﾞｶﾝ" ("Duration ") +#endif +#define MSG_INFO_MIN_TEMP "\xbe\xaf\xc3\xb2\xbb\xb2\xc3\xb2\xb5\xdd" // "ｾｯﾃｲｻｲﾃｲｵﾝ" ("Min Temp") +#define MSG_INFO_MAX_TEMP "\xbe\xaf\xc3\xb2\xbb\xb2\xba\xb3\xb5\xdd" // "ｾｯﾃｲｻｲｺｳｵﾝ" ("Max Temp") +#if LCD_WIDTH > 19 + #define MSG_INFO_PSU "\xc3\xde\xdd\xb9\xde\xdd\xbc\xad\xcd\xde\xc2" // "ﾃﾞﾝｹﾞﾝｼｭﾍﾞﾂ" ("Power Supply") +#else + #define MSG_INFO_PSU "\xc3\xde\xdd\xb9\xde\xdd" // "ﾃﾞﾝｹﾞﾝ" ("Power Supply") +#endif +#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") +#define MSG_FILAMENT_CHANGE_OPTION_RESUME "\xcc\xdf\xd8\xdd\xc4\xbb\xb2\xb6\xb2" // "ﾌﾟﾘﾝﾄｻｲｶｲ" ("Resume print") +#if LCD_HEIGHT >= 4 + #define MSG_FILAMENT_CHANGE_INIT_1 "\xba\xb3\xb6\xdd\xa6\xb6\xb2\xbc\xbc\xcf\xbd" // "ｺｳｶﾝｦｶｲｼｼﾏｽ" ("Wait for start") + #define MSG_FILAMENT_CHANGE_INIT_2 "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("of the filament") + #define MSG_FILAMENT_CHANGE_INIT_3 "" // "" ("change") + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xc7\xb7\xc0\xde\xbc\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄﾇｷﾀﾞｼﾁｭｳ" ("Wait for") + #define MSG_FILAMENT_CHANGE_UNLOAD_2 "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("filament unload") + #define MSG_FILAMENT_CHANGE_UNLOAD_3 "" + #define MSG_FILAMENT_CHANGE_INSERT_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xa6\xbf\xb3\xc6\xad\xb3\xbc," // "ﾌｨﾗﾒﾝﾄｦｿｳﾆｭｳｼ," ("Insert filament") + #define MSG_FILAMENT_CHANGE_INSERT_2 "\xb8\xd8\xaf\xb8\xbd\xd9\xc4\xbf\xde\xaf\xba\xb3\xbc\xcf\xbd" // "ｸﾘｯｸｽﾙﾄｿﾞｯｺｳｼﾏｽ" ("and press button") + #define MSG_FILAMENT_CHANGE_INSERT_3 "" // "" ("to continue...") + #define MSG_FILAMENT_CHANGE_LOAD_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xbf\xb3\xc3\xdd\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄｿｳﾃﾝﾁｭｳ" ("Wait for") + #define MSG_FILAMENT_CHANGE_LOAD_2 "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("filament load") + #define MSG_FILAMENT_CHANGE_LOAD_3 "" + #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xb5\xbc\xc0\xde\xbc\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄｵｼﾀﾞｼﾁｭｳ" ("Wait for") + #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("filament extrude") + #define MSG_FILAMENT_CHANGE_EXTRUDE_3 "" + #define MSG_FILAMENT_CHANGE_RESUME_1 "\xcc\xdf\xd8\xdd\xc4\xa6\xbb\xb2\xb6\xb2\xbc\xcf\xbd" // "ﾌﾟﾘﾝﾄｦｻｲｶｲｼﾏｽ" ("Wait for print") + #define MSG_FILAMENT_CHANGE_RESUME_2 "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "ｼﾊﾞﾗｸｵﾏﾁｸﾀﾞｻｲ" ("to resume") + #define MSG_FILAMENT_CHANGE_RESUME_3 "" +#else // LCD_HEIGHT < 4 + #define MSG_FILAMENT_CHANGE_INIT_1 "\xba\xb3\xb6\xdd\xa6\xb6\xb2\xbc\xbc\xcf\xbd" // "ｺｳｶﾝｦｶｲｼｼﾏｽ" ("Please wait...") + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xc7\xb7\xc0\xde\xbc\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄﾇｷﾀﾞｼﾁｭｳ" ("Ejecting...") + #if LCD_WIDTH > 19 + #define MSG_FILAMENT_CHANGE_INSERT_1 "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ｿｳﾆｭｳｼ,ｸﾘｯｸｼﾃｸﾀﾞｻｲ" ("Insert and Click") + #else + #define MSG_FILAMENT_CHANGE_INSERT_1 "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbe\xd6" // "ｿｳﾆｭｳｼ,ｸﾘｯｸｾﾖ" ("Insert and Click") + #endif + #define MSG_FILAMENT_CHANGE_LOAD_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xbf\xb3\xc3\xdd\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄｿｳﾃﾝﾁｭｳ" ("Loading...") + #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "\xcc\xa8\xd7\xd2\xdd\xc4\xb5\xbc\xc0\xde\xbc\xc1\xad\xb3" // "ﾌｨﾗﾒﾝﾄｵｼﾀﾞｼﾁｭｳ" ("Extruding...") + #define MSG_FILAMENT_CHANGE_RESUME_1 "\xcc\xdf\xd8\xdd\xc4\xa6\xbb\xb2\xb6\xb2\xbc\xcf\xbd" // "ﾌﾟﾘﾝﾄｦｻｲｶｲｼﾏｽ" ("Resuming...") +#endif // LCD_HEIGHT < 4 #endif // LANGUAGE_KANA_H diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h index 46aba87d2..dd2a8e5fb 100644 --- a/Marlin/language_kana_utf8.h +++ b/Marlin/language_kana_utf8.h @@ -61,14 +61,14 @@ #define MSG_SET_ORIGIN "キジュンセット" // "Set origin" #define MSG_PREHEAT_1 "PLA ヨネツ" // "Preheat PLA" #define MSG_PREHEAT_1_N MSG_PREHEAT_1 " " -#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " スベテ" // " All" -#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " ベッド" // " Bed" -#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " セッテイ" // " conf" +#define MSG_PREHEAT_1_ALL "PLA スベテヨネツ" // " All" +#define MSG_PREHEAT_1_BEDONLY "PLA ベッドヨネツ" // " Bed" +#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "セッテイ" // " conf" #define MSG_PREHEAT_2 "ABS ヨネツ" // "Preheat ABS" #define MSG_PREHEAT_2_N MSG_PREHEAT_2 " " -#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " スベテ" // " All" -#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " ベッド" // " Bed" -#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " セッテイ" // " conf" +#define MSG_PREHEAT_2_ALL "ABS スベテヨネツ" // " All" +#define MSG_PREHEAT_2_BEDONLY "ABS ベッドヨネツ" // " Bed" +#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 "セッテイ" // " conf" #define MSG_COOLDOWN "カネツテイシ" // "Cooldown" #define MSG_SWITCH_PS_ON "デンゲン オン" // "Switch power on" #define MSG_SWITCH_PS_OFF "デンゲン オフ" // "Switch power off" @@ -155,8 +155,8 @@ #define MSG_INIT_SDCARD "SDカードサイヨミコミ" // "Init. SD card" #define MSG_CNG_SDCARD "SDカードコウカン" // "Change SD card" #define MSG_ZPROBE_OUT "Zプローブ ベッドガイ" // "Z probe out. bed" -#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST -#define MSG_FIRST "first" +#define MSG_HOME "サキニ" // "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST +#define MSG_FIRST "ヲフッキサセテクダサイ" // "first" #define MSG_ZPROBE_ZOFFSET "Zオフセット" // "Z Offset" #define MSG_BABYSTEP_X "Xジク ビドウ" // "Babystep X" #define MSG_BABYSTEP_Y "Yジク ビドウ" // "Babystep Y" @@ -169,6 +169,12 @@ #define MSG_ERR_MINTEMP "エラー:サイテイオンミマン" // "Err: MINTEMP" #define MSG_ERR_MAXTEMP_BED "エラー:ベッド サイコウオンチョウカ" // "Err: MAXTEMP BED" #define MSG_ERR_MINTEMP_BED "エラー:ベッド サイテイオンミマン" // "Err: MINTEMP BED" +#define MSG_HALTED "プリンターハテイシシマシタ" // "PRINTER HALTED" +#define MSG_PLEASE_RESET "リセットシテクダサイ" // "Please reset" +#define MSG_SHORT_DAY "d" // One character only +#define MSG_SHORT_HOUR "h" // One character only +#define MSG_SHORT_MINUTE "m" // One character only +#define MSG_PRINT_TIME "プリントジカン" // "Print time" #define MSG_HEATING "カネツチュウ" // "Heating..." #define MSG_HEATING_COMPLETE "カネツカンリョウ" // "Heating done." #define MSG_BED_HEATING "ベッド カネツチュウ" // "Bed Heating." @@ -178,5 +184,41 @@ #define MSG_DELTA_CALIBRATE_Y "Yジク コウセイ" // "Calibrate Y" #define MSG_DELTA_CALIBRATE_Z "Zジク コウセイ" // "Calibrate Z" #define MSG_DELTA_CALIBRATE_CENTER "チュウシン コウセイ" // "Calibrate Center" +#define MSG_INFO_MENU "コノプリンターニツイテ" // "About Printer" +#define MSG_INFO_PRINTER_MENU "プリンタージョウホウ" // "Printer Info" +#define MSG_INFO_STATS_MENU "プリントジョウキョウ" // "Printer Stats" +#define MSG_INFO_BOARD_MENU "セイギョケイジョウホウ" // "Board Info" +#define MSG_INFO_THERMISTOR_MENU "サーミスター" // "Thermistors" +#define MSG_INFO_EXTRUDERS "エクストルーダースウ" // "Extruders" +#define MSG_INFO_BAUDRATE "ボーレート" // "Baud" +#define MSG_INFO_PROTOCOL "プロトコル" // "Protocol" +#define MSG_INFO_PRINT_COUNT "プリントスウ " // "Print Count " +#define MSG_INFO_COMPLETED_PRINTS "カンリョウスウ" // "Finished " +#define MSG_INFO_PRINT_TIME "ゴウケイジカン" // "Total Time " +#define MSG_INFO_MIN_TEMP "セッテイサイテイオン" // "Min Temp" +#define MSG_INFO_MAX_TEMP "セッテイサイコウオン" // "Max Temp" +#define MSG_INFO_PSU "デンゲンシュベツ" // "Power Supply" +#define MSG_FILAMENT_CHANGE_HEADER "フィラメントコウカン" // "CHANGE FILAMENT" +#define MSG_FILAMENT_CHANGE_OPTION_HEADER "ドウサヲセンタクシテクダサイ" // "CHANGE OPTIONS:" +#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "サラニオシダス" // "Extrude more" +#define MSG_FILAMENT_CHANGE_OPTION_RESUME "プリントサイカイ" // "Resume print" +#define MSG_FILAMENT_CHANGE_INIT_1 "コウカンヲカイシシマス" // "Wait for start" +#define MSG_FILAMENT_CHANGE_INIT_2 "シバラクオマチクダサイ" // "of the filament" +#define MSG_FILAMENT_CHANGE_INIT_3 "" // "change" +#define MSG_FILAMENT_CHANGE_UNLOAD_1 "フィラメントヌキダシチュウ" // "Wait for" +#define MSG_FILAMENT_CHANGE_UNLOAD_2 "シバラクオマチクダサイ" // "filament unload" +#define MSG_FILAMENT_CHANGE_UNLOAD_3 "" +#define MSG_FILAMENT_CHANGE_INSERT_1 "フィラメントヲソウニュウシ," // "Insert filament" +#define MSG_FILAMENT_CHANGE_INSERT_2 "クリックスルトゾッコウシマス" // "and press button" +#define MSG_FILAMENT_CHANGE_INSERT_3 "" // "to continue..." +#define MSG_FILAMENT_CHANGE_LOAD_1 "フィラメントソウテンチュウ" // "Wait for" +#define MSG_FILAMENT_CHANGE_LOAD_2 "シバラクオマチクダサイ" // "filament load" +#define MSG_FILAMENT_CHANGE_LOAD_3 "" +#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "フィラメントオシダシチュウ" // "Wait for" +#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "シバラクオマチクダサイ" // "filament extrude" +#define MSG_FILAMENT_CHANGE_EXTRUDE_3 "" +#define MSG_FILAMENT_CHANGE_RESUME_1 "プリントヲサイカイシマス" // "Wait for print" +#define MSG_FILAMENT_CHANGE_RESUME_2 "シバラクオマチクダサイ" // "to resume" +#define MSG_FILAMENT_CHANGE_RESUME_3 "" #endif // LANGUAGE_KANA_UTF_H