From 39732838b499d29b4d23aff3c662affa50bc611b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 17 Sep 2018 00:57:26 -0500 Subject: [PATCH] Tweak indent of Chinese languages --- Marlin/src/lcd/language/language_zh_CN.h | 71 ++++++++++++------------ Marlin/src/lcd/language/language_zh_TW.h | 71 ++++++++++++------------ 2 files changed, 70 insertions(+), 72 deletions(-) diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 020073ddd0..3ddd48be6e 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -328,17 +328,17 @@ #define MSG_CASE_LIGHT_BRIGHTNESS _UxGT("灯亮度") // "Light BRIGHTNESS" #if LCD_WIDTH > 19 -#define MSG_INFO_PRINT_COUNT _UxGT("打印计数") //"Print Count" -#define MSG_INFO_COMPLETED_PRINTS _UxGT("完成了") //"Completed" -#define MSG_INFO_PRINT_TIME _UxGT("总打印时间") //"Total print time" -#define MSG_INFO_PRINT_LONGEST _UxGT("最长工作时间") //"Longest job time" -#define MSG_INFO_PRINT_FILAMENT _UxGT("总计挤出") //"Extruded total" + #define MSG_INFO_PRINT_COUNT _UxGT("打印计数") //"Print Count" + #define MSG_INFO_COMPLETED_PRINTS _UxGT("完成了") //"Completed" + #define MSG_INFO_PRINT_TIME _UxGT("总打印时间") //"Total print time" + #define MSG_INFO_PRINT_LONGEST _UxGT("最长工作时间") //"Longest job time" + #define MSG_INFO_PRINT_FILAMENT _UxGT("总计挤出") //"Extruded total" #else -#define MSG_INFO_PRINT_COUNT _UxGT("打印数") //"Prints" -#define MSG_INFO_COMPLETED_PRINTS _UxGT("完成") //"Completed" -#define MSG_INFO_PRINT_TIME _UxGT("总共") //"Total" -#define MSG_INFO_PRINT_LONGEST _UxGT("最长") //"Longest" -#define MSG_INFO_PRINT_FILAMENT _UxGT("已挤出") //"Extruded" + #define MSG_INFO_PRINT_COUNT _UxGT("打印数") //"Prints" + #define MSG_INFO_COMPLETED_PRINTS _UxGT("完成") //"Completed" + #define MSG_INFO_PRINT_TIME _UxGT("总共") //"Total" + #define MSG_INFO_PRINT_LONGEST _UxGT("最长") //"Longest" + #define MSG_INFO_PRINT_FILAMENT _UxGT("已挤出") //"Extruded" #endif #define MSG_INFO_MIN_TEMP _UxGT("最低温度") //"Min Temp" @@ -359,33 +359,32 @@ #define MSG_M600_TOO_COLD _UxGT("M600: 太凉") // "M600: Too cold" #if LCD_HEIGHT >= 4 -#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("等待开始") //"Wait for start" -#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("丝料") //"of the filament" -#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("变更") //"change" -#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("等待") //"Wait for" -#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("卸下丝料") //"filament unload" -#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入丝料") //"Insert filament" -#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("并按键") //"and press button" -#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("来继续 ...") //"to continue..." -#define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("按下按钮来") // "Press button to" -#define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("加热喷嘴.") // "heat nozzle." -#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加热喷嘴") // "Heating nozzle" -#define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("请等待 ...") // "Please wait..." -#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("等待") //"Wait for" -#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("进料") //"filament load" -#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("等待") // "Wait for" -#define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("丝料清除") // "filament purge" -#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("等待打印") //"Wait for print" -#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("恢复") //"to resume" - + #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("等待开始") //"Wait for start" + #define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("丝料") //"of the filament" + #define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("变更") //"change" + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("等待") //"Wait for" + #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("卸下丝料") //"filament unload" + #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入丝料") //"Insert filament" + #define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("并按键") //"and press button" + #define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("来继续 ...") //"to continue..." + #define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("按下按钮来") // "Press button to" + #define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("加热喷嘴.") // "heat nozzle." + #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加热喷嘴") // "Heating nozzle" + #define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("请等待 ...") // "Please wait..." + #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("等待") //"Wait for" + #define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("进料") //"filament load" + #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("等待") // "Wait for" + #define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("丝料清除") // "filament purge" + #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("等待打印") //"Wait for print" + #define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("恢复") //"to resume" #else // LCD_HEIGHT < 4 -#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("请等待 ...") //"Please wait..." -#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("退出中 ...") //"Ejecting..." -#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入并单击") //"Insert and Click" -#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加热中 ...") // "Heating..." -#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("装载中 ...") //"Loading..." -#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("清除中 ...") // "Purging..." -#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("恢复中 ...") //"Resuming..." + #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("请等待 ...") //"Please wait..." + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("退出中 ...") //"Ejecting..." + #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入并单击") //"Insert and Click" + #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加热中 ...") // "Heating..." + #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("装载中 ...") //"Loading..." + #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("清除中 ...") // "Purging..." + #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("恢复中 ...") //"Resuming..." #endif // LCD_HEIGHT < 4 #endif // LANGUAGE_ZH_CN_H diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 8500a4f9a8..60e1661cf0 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -328,17 +328,17 @@ #define MSG_CASE_LIGHT_BRIGHTNESS _UxGT("燈亮度") // "Light BRIGHTNESS" #if LCD_WIDTH > 19 -#define MSG_INFO_PRINT_COUNT _UxGT("列印計數") //"Print Count" -#define MSG_INFO_COMPLETED_PRINTS _UxGT("已完成") //"Completed" -#define MSG_INFO_PRINT_TIME _UxGT("總列印時間") //"Total print time" -#define MSG_INFO_PRINT_LONGEST _UxGT("最長工作時間") //"Longest job time" -#define MSG_INFO_PRINT_FILAMENT _UxGT("總計擠出") //"Extruded total" + #define MSG_INFO_PRINT_COUNT _UxGT("列印計數") //"Print Count" + #define MSG_INFO_COMPLETED_PRINTS _UxGT("已完成") //"Completed" + #define MSG_INFO_PRINT_TIME _UxGT("總列印時間") //"Total print time" + #define MSG_INFO_PRINT_LONGEST _UxGT("最長工作時間") //"Longest job time" + #define MSG_INFO_PRINT_FILAMENT _UxGT("總計擠出") //"Extruded total" #else -#define MSG_INFO_PRINT_COUNT _UxGT("列印數") //"Prints" -#define MSG_INFO_COMPLETED_PRINTS _UxGT("完成") //"Completed" -#define MSG_INFO_PRINT_TIME _UxGT("總共") //"Total" -#define MSG_INFO_PRINT_LONGEST _UxGT("最長") //"Longest" -#define MSG_INFO_PRINT_FILAMENT _UxGT("已擠出") //"Extruded" + #define MSG_INFO_PRINT_COUNT _UxGT("列印數") //"Prints" + #define MSG_INFO_COMPLETED_PRINTS _UxGT("完成") //"Completed" + #define MSG_INFO_PRINT_TIME _UxGT("總共") //"Total" + #define MSG_INFO_PRINT_LONGEST _UxGT("最長") //"Longest" + #define MSG_INFO_PRINT_FILAMENT _UxGT("已擠出") //"Extruded" #endif #define MSG_INFO_MIN_TEMP _UxGT("最低溫度") //"Min Temp" @@ -359,33 +359,32 @@ #define MSG_M600_TOO_COLD _UxGT("M600: 太涼") // "M600: Too cold" #if LCD_HEIGHT >= 4 -#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("等待開始") //"Wait for start" -#define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("絲料") //"of the filament" -#define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("變更") //"change" -#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("等待") //"Wait for" -#define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("卸下絲料") //"filament unload" -#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入絲料") //"Insert filament" -#define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("並按鍵") //"and press button" -#define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("繼續 ...") //"to continue..." -#define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("按下按鈕來") // "Press button to" -#define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("加熱噴嘴.") // "heat nozzle." -#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加熱噴嘴") // "Heating nozzle" -#define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("請等待 ...") // "Please wait..." -#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("等待") //"Wait for" -#define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("進料") //"filament load" -#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("等待") // "Wait for" -#define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("絲料清除") // "filament purge" -#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("等待列印") //"Wait for print" -#define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("恢復") //"to resume" - + #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("等待開始") //"Wait for start" + #define MSG_FILAMENT_CHANGE_INIT_2 _UxGT("絲料") //"of the filament" + #define MSG_FILAMENT_CHANGE_INIT_3 _UxGT("變更") //"change" + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("等待") //"Wait for" + #define MSG_FILAMENT_CHANGE_UNLOAD_2 _UxGT("卸下絲料") //"filament unload" + #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入絲料") //"Insert filament" + #define MSG_FILAMENT_CHANGE_INSERT_2 _UxGT("並按鍵") //"and press button" + #define MSG_FILAMENT_CHANGE_INSERT_3 _UxGT("繼續 ...") //"to continue..." + #define MSG_FILAMENT_CHANGE_HEAT_1 _UxGT("按下按鈕來") // "Press button to" + #define MSG_FILAMENT_CHANGE_HEAT_2 _UxGT("加熱噴嘴.") // "heat nozzle." + #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加熱噴嘴") // "Heating nozzle" + #define MSG_FILAMENT_CHANGE_HEATING_2 _UxGT("請等待 ...") // "Please wait..." + #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("等待") //"Wait for" + #define MSG_FILAMENT_CHANGE_LOAD_2 _UxGT("進料") //"filament load" + #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("等待") // "Wait for" + #define MSG_FILAMENT_CHANGE_PURGE_2 _UxGT("絲料清除") // "filament purge" + #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("等待列印") //"Wait for print" + #define MSG_FILAMENT_CHANGE_RESUME_2 _UxGT("恢復") //"to resume" #else // LCD_HEIGHT < 4 -#define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("請等待 ...") //"Please wait..." -#define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("退出中 ...") //"Ejecting..." -#define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入並點擊") //"Insert and Click" -#define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加熱中 ...") // "Heating..." -#define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("載入中 ...") //"Loading..." -#define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("清除中 ...") // "Purging..." -#define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("恢復中 ...") //"Resuming..." + #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("請等待 ...") //"Please wait..." + #define MSG_FILAMENT_CHANGE_UNLOAD_1 _UxGT("退出中 ...") //"Ejecting..." + #define MSG_FILAMENT_CHANGE_INSERT_1 _UxGT("插入並點擊") //"Insert and Click" + #define MSG_FILAMENT_CHANGE_HEATING_1 _UxGT("加熱中 ...") // "Heating..." + #define MSG_FILAMENT_CHANGE_LOAD_1 _UxGT("載入中 ...") //"Loading..." + #define MSG_FILAMENT_CHANGE_PURGE_1 _UxGT("清除中 ...") // "Purging..." + #define MSG_FILAMENT_CHANGE_RESUME_1 _UxGT("恢復中 ...") //"Resuming..." #endif // LCD_HEIGHT < 4 #endif // LANGUAGE_ZH_TW_H