diff --git a/src/ArduinoDUE/Repetier/ui.cpp b/src/ArduinoDUE/Repetier/ui.cpp index c8caaaa..074d184 100644 --- a/src/ArduinoDUE/Repetier/ui.cpp +++ b/src/ArduinoDUE/Repetier/ui.cpp @@ -1783,6 +1783,8 @@ void UIDisplay::parse(const char *txt,bool ram) else if ((c2 == 'a') && (Com::selectedLanguage ==10) )addStringP("\003"); //Finnish selected else if ((c2 == 'b') && (Com::selectedLanguage ==11) )addStringP("\003"); + //Japanese selected + else if ((c2 == 'c') && (Com::selectedLanguage ==12) )addStringP("\003"); break; case 'l': if(c2 == 'a') addInt(lastAction,4); diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index df6d826..8ab9554 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -6648,8 +6648,8 @@ #define UI_TEXT_PAGE_EXTRUDER2_JP "E2:%e1/%E1" cDEG "C" cARROW "%o1" #define UI_TEXT_PAGE_EXTRUDER3_JP "E3:%e2/%E2" cDEG "C" cARROW "%o2" #define UI_TEXT_PAGE_BED_JP " B:%eb/%Eb" cDEG "C" cARROW "%ob" -#define UI_TEXT_SPEED_MULTIPLY_JP "½Ëß°ÄÞ ÊÞ²ØÂ:%om%%%" // "Speed Mul.:%om%%%" -#define UI_TEXT_FLOW_MULTIPLY_JP "ÌÛ° ÊÞ²ØÂ: %of%%%" // "Flow Mul.: %of%%%" +#define UI_TEXT_SPEED_MULTIPLY_JP "Mul.½Ëß°ÄÞ:%om%%%" // "Speed Mul.:%om%%%" +#define UI_TEXT_FLOW_MULTIPLY_JP "Mul.ÌÛ°: %of%%%" // "Flow Mul.: %of%%%" #define UI_TEXT_SHOW_MEASUREMENT_JP "¹²¿¸ Ë®³¼Þ" // "Show meas." #define UI_TEXT_RESET_MEASUREMENT_JP "¹²¿¸ ؾ¯Ä" // "Reset meas." #define UI_TEXT_SET_MEASURED_ORIGIN_JP "¾¯Ä Z=0" // "Set Z=0" @@ -6664,9 +6664,9 @@ #define UI_TEXT_SD_REMOVED_JP "SD¶°ÄÞ¦ DzÀ" // "SD Card removed" #define UI_TEXT_SD_INSERTED_JP "SD¶°ÄÞ¦ ²ÚÀ" // "SD Card inserted" #define UI_TEXT_PRINTER_READY_JP "¼Þ­ÝËÞ ¶ÝØ®³" // "Printer ready." -#define UI_TEXT_PRINTTIME_DAYS_JP " days " -#define UI_TEXT_PRINTTIME_HOURS_JP ":" -#define UI_TEXT_PRINTTIME_MINUTES_JP "" +#define UI_TEXT_PRINTTIME_DAYS_JP " ÆÁ " // " days " +#define UI_TEXT_PRINTTIME_HOURS_JP "¼Þ¶Ý" // ":" +#define UI_TEXT_PRINTTIME_MINUTES_JP "ÌÝ" // "" #define UI_TEXT_PRINT_TIME_JP "ÌßØÝÄ À²Ñ" // "Printing time" #define UI_TEXT_PRINT_FILAMENT_JP "̨×ÒÝÄ ÌßØÝÄ" // "Filament printed" #define UI_TEXT_PRINTED_JP "ÌßØÝÄ" // "printed" @@ -6698,8 +6698,8 @@ #define UI_TEXT_BLUETAPE_JP "Blue paper tape" #define UI_TEXT_PETTAPE_JP "Green PET tape" #define UI_TEXT_GLUESTICK_JP "Glue stick" -#define UI_TEXT_CUSTOM_JP "Custom" -#define UI_TEXT_COATING_CUSTOM_JP "Custom: %BCmm" +#define UI_TEXT_CUSTOM_JP "¶½ÀÑ" // "Custom" +#define UI_TEXT_COATING_CUSTOM_JP "¶½ÀÑ: %BCmm" // "Custom: %BCmm" #define UI_TEXT_LANGUAGE_JP "Language" #if NUM_EXTRUDER > 2 || MIXING_EXTRUDER != 0 #define UI_TEXT_MAINPAGE6_1_JP "\xa %ec/%Ec\xb0 X:%x0" @@ -6758,15 +6758,15 @@ #define UI_TEXT_UNLOAD_FILAMENT_JP "UnloadFilament%s1" #if NUM_EXTRUDER == 1 #define UI_TEXT_FIL_SENSOR_ONOFF_JP "Fil.Sensor: %sf" -#define UI_TEXT_CLEANING_DRIPBOX_JP "Cleaning Dripbox" -#define UI_TEXT_CLEAN_DRIPBOX_JP "Clean Dripbox" +#define UI_TEXT_CLEANING_DRIPBOX_JP "Dripbox ¸Ø°ÆݸÞ" // "Cleaning Dripbox" +#define UI_TEXT_CLEAN_DRIPBOX_JP "Dripbox¦ ÄØÀÞ½" // "Clean Dripbox" #define UI_TEXT_CLEAN_DRIPBOX_3_JP "Dripbox" #define UI_TEXT_EXTR_XOFF_JP "Xoffst:%Xxmm" #define UI_TEXT_EXTR_YOFF_JP "Yoffst:%Xymm" #else #define UI_TEXT_FIL_SENSOR_ONOFF_JP "Fil.Sensors:%sf" -#define UI_TEXT_CLEAN_DRIPBOX_JP "Clean Dripboxes" -#define UI_TEXT_CLEANING_DRIPBOX_JP "Cleaning Dripboxes" +#define UI_TEXT_CLEAN_DRIPBOX_JP "Dripbox ¸Ø°ÆݸÞ" // "Clean Dripboxes" +#define UI_TEXT_CLEANING_DRIPBOX_JP "Dripbox¦ ÄØÀÞ½" // "Cleaning Dripboxes" #define UI_TEXT_CLEAN_DRIPBOX_3_JP "Dripboxes" #define UI_TEXT_EXTR_XOFF_JP "Xoffst:%Xxmm" #define UI_TEXT_EXTR_YOFF_JP "Yoffst:%Xymm" @@ -6778,9 +6778,9 @@ #define UI_TEXT_FEED_LOADING_FILAMENT_JP "Load Fil.:%fl" #define UI_TEXT_FEED_UNLOADING_FILAMENT_JP "Unload F.:%fu" #define UI_TEXT_LOADING_UNLOADING_DISTANCE_JP "Load dist.: %fd" -#define UI_TEXT_BED_DOWN_JP "Bed Down" +#define UI_TEXT_BED_DOWN_JP "ÍÞ¯ÄÞ¦ »¹ÞÙ" // "Bed Down" #define UI_TEXT_WIFI_ONOFF_JP "Wifi: %wo" -#define UI_TEXT_REDO_ACTION_JP "Do it again ?" +#define UI_TEXT_REDO_ACTION_JP "Ó³ ²ÁÄÞ ?" // "Do it again ?" #define UI_TEXT_X_LENGTH_JP "X Length:%Lxmm" #define UI_TEXT_Y_LENGTH_JP "Y Length:%Lymm" #define UI_TEXT_Z_LENGTH_JP "Z Length:%Lzmm" @@ -6844,7 +6844,7 @@ #define UI_TEXT_PLEASE_WAIT_JP "µÏÁ¸ÀÞ»²" // "Please wait" #define UI_TEXT_MANUAL_LEVEL_JP "¼­ÄÞ³ Á®³¾²" // "Manual leveling" #define UI_TEXT_WARNING_JP "Ü°ÆݸÞ!" // "Warning!" -#define UI_TEXT_EXTRUDER_COLD_JP "E%Ne is too cold!" +#define UI_TEXT_EXTRUDER_COLD_JP "E%Ne¶Þ ˴òϽ!" // "E%Ne is too cold!" #define UI_TEXT_HEAT_EXTRUDER_JP "Heat extruder ?" #define UI_TEXT_WRITE_DEBUG_JP "Write Debug" #define UI_TEXT_POWER_SAVE_MENU_JP "ÊßÜ°¾°ÌÞ" // "Powersave" @@ -6889,9 +6889,9 @@ #define UI_TEXT_CONFIRMED_JP "¶¸ÆݼϼÀ" // "Action confirmed!" #define UI_TEXT_CLEAN_NOZZLE_JP "ɽÞÙ ¸Ø°Ý"// "Clean Nozzle" #define UI_TEXT_CLEANING_NOZZLE_JP "ɽÞÙ ¸Ø°ÆݸÞ" // "Cleaning Nozzle" -#define UI_TEXT_CLEAN_DRIPBOX_1_JP "ÄÞدÌßBOX¦ÄØÀÞ¼Ã" // "Please Take" +#define UI_TEXT_CLEAN_DRIPBOX_1_JP "Dripbox¦ ÄØÀÞ¼Ã" // "Please Take" #define UI_TEXT_CLEAN_DRIPBOX_2_JP "¿³¼Þ¼Ã ¸ÀÞ»²" // "And Clean" -#define UI_TEXT_PUSH_FILAMENT_JP "̨×ÒÝĦ µ¼ºÑ" // "Push Filament" +#define UI_TEXT_PUSH_FILAMENT_JP "̨×ÒÝÄÉ Ç·/»¼" // "Push Filament" #define UI_TEXT_WAIT_FILAMENT_JP "OK ÃÞ ½À°Ä" // "Push Ok to start" #define UI_TEXT_LOAD_FAILSAFE2_JP "after loading ?" #define UI_TEXT_LOAD_FAILSAFE_JP "Load Fail-Safe" @@ -6929,19 +6929,19 @@ #if NUM_EXTRUDER == 1 #define UI_TEXT_P1_L1_JP "\005%ec/%Ec\002" #define UI_TEXT_P1_L2_JP "Z:%x2" -#define UI_TEXT_P1_L3_JP "Buffer:%oB" +#define UI_TEXT_P1_L3_JP "Êޯ̧°:%oB" // "Buffer:%oB" #define UI_TEXT_P1_L1_EASY_JP "\005%ec/%Ec\002" #define UI_TEXT_P1_L2_EASY_JP "Z:%x2" -#define UI_TEXT_P1_L3_EASY_JP "Buffer:%oB" +#define UI_TEXT_P1_L3_EASY_JP "Êޯ̧°:%oB" // "Buffer:%oB" #else #define UI_TEXT_P1_L1_JP "\005%e0/%E0\005%e1/%E1" #define UI_TEXT_P1_L2_JP "Z:%x2" -#define UI_TEXT_P1_L3_JP "Buffer:%oB" +#define UI_TEXT_P1_L3_JP "Êޯ̧°:%oB" // "Buffer:%oB" #define UI_TEXT_P1_L1_EASY_JP "\005%e0/%E0\005%e1/%E1" #define UI_TEXT_P1_L2_EASY_JP "Z:%x2" -#define UI_TEXT_P1_L3_EASY_JP "Buffer:%oB" +#define UI_TEXT_P1_L3_EASY_JP "Êޯ̧°:%oB" // "Buffer:%oB" #endif #endif #define UI_TEXT_DBG_ENDSTOP_JP "EndStop:%dp"