Merge upstream changes from Marlin 2.1.1

This commit is contained in:
Stefan Kalscheuer
2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions

View File

@@ -55,6 +55,7 @@ namespace Language_zh_CN {
LSTR MSG_DISABLE_STEPPERS = _UxGT("关闭步进电机"); // "Disable steppers"
LSTR MSG_DEBUG_MENU = _UxGT("调试菜单"); // "Debug Menu"
LSTR MSG_PROGRESS_BAR_TEST = _UxGT("进度条测试"); // "Progress Bar Test"
LSTR MSG_HOMING = _UxGT("回原点");
LSTR MSG_AUTO_HOME = _UxGT("自动回原点"); // "Auto home"
LSTR MSG_AUTO_HOME_X = _UxGT("回X原位"); // "Home X"
LSTR MSG_AUTO_HOME_Y = _UxGT("回Y原位"); // "Home Y"
@@ -67,8 +68,7 @@ namespace Language_zh_CN {
LSTR MSG_Z_FADE_HEIGHT = _UxGT("淡出高度"); // "Fade Height"
LSTR MSG_SET_HOME_OFFSETS = _UxGT("设置原点偏移"); // "Set home offsets"
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("偏移已启用"); // "Offsets applied"
LSTR MSG_SET_ORIGIN = _UxGT("设置原点"); // "Set origin"
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_PREHEAT_1 = _UxGT("预热 ") PREHEAT_1_LABEL; // "Preheat PREHEAT_2_LABEL"
LSTR MSG_PREHEAT_1_H = _UxGT("预热 ") PREHEAT_1_LABEL " ~"; // "Preheat PREHEAT_2_LABEL"
LSTR MSG_PREHEAT_1_END = _UxGT("预热 ") PREHEAT_1_LABEL _UxGT(" 喷嘴"); //MSG_PREHEAT_1 " "
@@ -93,8 +93,8 @@ namespace Language_zh_CN {
LSTR MSG_SPINDLE_MENU = _UxGT("主轴控制");
LSTR MSG_SPINDLE_POWER = _UxGT("主轴电源");
LSTR MSG_SPINDLE_REVERSE = _UxGT("主轴反转");
LSTR MSG_SWITCH_PS_ON = _UxGT("电源打开"); // "Switch power on"
LSTR MSG_SWITCH_PS_OFF = _UxGT("电源关闭"); // "Switch power off"
LSTR MSG_SWITCH_PS_ON = _UxGT("开启电源"); // "Switch power on"
LSTR MSG_SWITCH_PS_OFF = _UxGT("关闭电源"); // "Switch power off"
LSTR MSG_EXTRUDE = _UxGT("挤出"); // "Extrude"
LSTR MSG_RETRACT = _UxGT("回抽"); // "Retract"
LSTR MSG_MOVE_AXIS = _UxGT("移动轴"); // "Move axis"
@@ -119,9 +119,8 @@ namespace Language_zh_CN {
LSTR MSG_IDEX_MODE_DUPLICATE = _UxGT("复制");
LSTR MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("镜像复制");
LSTR MSG_IDEX_MODE_FULL_CTRL = _UxGT("完全控制");
LSTR MSG_HOTEND_OFFSET_X = _UxGT("第二喷头是X");
LSTR MSG_HOTEND_OFFSET_Y = _UxGT("第二喷头是Y");
LSTR MSG_HOTEND_OFFSET_Z = _UxGT("第二喷头是Z");
LSTR MSG_HOTEND_OFFSET_A = _UxGT("第二喷头是@");
LSTR MSG_UBL_DOING_G29 = _UxGT("执行G29"); // "Doing G29"
LSTR MSG_UBL_TOOLS = _UxGT("UBL工具"); // "UBL Tools"
LSTR MSG_UBL_LEVEL_BED = _UxGT("统一热床调平(UBL)"); // "Unified Bed Leveling"
@@ -143,7 +142,7 @@ namespace Language_zh_CN {
LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("完成编辑网格"); // "Done Editing Mesh"
LSTR MSG_UBL_BUILD_CUSTOM_MESH = _UxGT("创设客户网格"); // "Build Custom Mesh"
LSTR MSG_UBL_BUILD_MESH_MENU = _UxGT("创设网格"); // "Build Mesh"
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_UBL_BUILD_MESH_M = _UxGT("创设 $ 网格"); // "Build PREHEAT_1_LABEL Mesh"
LSTR MSG_UBL_VALIDATE_MESH_M = _UxGT("批准 $ 网格"); // "Validate PREHEAT_1_LABEL Mesh"
#endif
@@ -223,10 +222,11 @@ namespace Language_zh_CN {
LSTR MSG_MOVE_X = _UxGT("移动X"); // "Move X"
LSTR MSG_MOVE_Y = _UxGT("移动Y"); // "Move Y"
LSTR MSG_MOVE_Z = _UxGT("移动Z"); // "Move Z"
LSTR MSG_MOVE_N = _UxGT("移动@"); // "Move @"
LSTR MSG_MOVE_E = _UxGT("挤出机"); // "Extruder"
LSTR MSG_MOVE_EN = _UxGT("挤出机 *"); // "Extruder"
LSTR MSG_HOTEND_TOO_COLD = _UxGT("热端太冷");
LSTR MSG_MOVE_N_MM = _UxGT("移动 %s mm"); // "Move 0.025mm"
LSTR MSG_MOVE_N_MM = _UxGT("移动 $ mm"); // "Move 0.025mm"
LSTR MSG_MOVE_01MM = _UxGT("移动 0.1 mm"); // "Move 0.1mm"
LSTR MSG_MOVE_1MM = _UxGT("移动 1 mm"); // "Move 1mm"
LSTR MSG_MOVE_10MM = _UxGT("移动 10 mm"); // "Move 10mm"
@@ -261,52 +261,44 @@ namespace Language_zh_CN {
LSTR MSG_PID_AUTOTUNE = _UxGT("自动PID");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("自动PID *");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("PID调整完成");
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("自动调失败. 坏的挤出机");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("自动调失败. 温度太高");
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("自动调失败! 坏的挤出机");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("自动调失败! 温度太高");
LSTR MSG_PID_TIMEOUT = _UxGT("自动调失败! 超时");
LSTR MSG_SELECT = _UxGT("选择"); // "Select"
LSTR MSG_SELECT_E = _UxGT("选择 *");
LSTR MSG_ACC = _UxGT("加速度"); // "Accel" acceleration
LSTR MSG_JERK = _UxGT("抖动速率"); // "Jerk"
LSTR MSG_VA_JERK = _UxGT("轴抖动速率") LCD_STR_A; // "Va-jerk"
LSTR MSG_VB_JERK = _UxGT("轴抖动速率") LCD_STR_B; // "Vb-jerk"
LSTR MSG_VC_JERK = _UxGT("轴抖动速率") LCD_STR_C; // "Vc-jerk"
LSTR MSG_VI_JERK = _UxGT("轴抖动速率") LCD_STR_I; // "Vi-jerk"
LSTR MSG_VJ_JERK = _UxGT("轴抖动速率") LCD_STR_J; // "Vj-jerk"
LSTR MSG_VK_JERK = _UxGT("轴抖动速率") LCD_STR_K; // "Vk-jerk"
LSTR MSG_VA_JERK = _UxGT("轴抖动速率") STR_A; // "Va-jerk"
LSTR MSG_VB_JERK = _UxGT("轴抖动速率") STR_B; // "Vb-jerk"
LSTR MSG_VC_JERK = _UxGT("轴抖动速率") STR_C; // "Vc-jerk"
LSTR MSG_VN_JERK = _UxGT("轴抖动速率@"); // "V@-jerk"
LSTR MSG_VE_JERK = _UxGT("挤出机抖动速率"); // "Ve-jerk"
LSTR MSG_JUNCTION_DEVIATION = _UxGT("接点差");
LSTR MSG_VELOCITY = _UxGT("速度"); // "Velocity"
LSTR MSG_VMAX_A = _UxGT("最大进料速率") LCD_STR_A; // "Vmax " max_feedrate_mm_s
LSTR MSG_VMAX_B = _UxGT("最大进料速率") LCD_STR_B;
LSTR MSG_VMAX_C = _UxGT("最大进料速率") LCD_STR_C;
LSTR MSG_VMAX_I = _UxGT("最大进料速率") LCD_STR_I;
LSTR MSG_VMAX_J = _UxGT("最大进料速率") LCD_STR_J;
LSTR MSG_VMAX_K = _UxGT("最大进料速率") LCD_STR_K;
LSTR MSG_VMAX_E = _UxGT("最大进料速率") LCD_STR_E;
LSTR MSG_MAX_SPEED = _UxGT("速度"); // "Velocity"
LSTR MSG_VMAX_A = _UxGT("最大进料速率") STR_A; // "Vmax " max_feedrate_mm_s
LSTR MSG_VMAX_B = _UxGT("最大进料速率") STR_B;
LSTR MSG_VMAX_C = _UxGT("最大进料速率") STR_C;
LSTR MSG_VMAX_N = _UxGT("最大进料速率@");
LSTR MSG_VMAX_E = _UxGT("最大进料速率E");
LSTR MSG_VMAX_EN = _UxGT("最大进料速率 *");
LSTR MSG_VMIN = _UxGT("最小进料速率"); // "Vmin" min_feedrate_mm_s
LSTR MSG_VTRAV_MIN = _UxGT("最小移动速率"); // "VTrav min" min_travel_feedrate_mm_s, (target) speed of the move
LSTR MSG_ACCELERATION = _UxGT("加速度"); // "Acceleration"
LSTR MSG_AMAX_A = _UxGT("最大打印加速度") LCD_STR_A; // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
LSTR MSG_AMAX_B = _UxGT("最大打印加速度") LCD_STR_B;
LSTR MSG_AMAX_C = _UxGT("最大打印加速度") LCD_STR_C;
LSTR MSG_AMAX_I = _UxGT("最大打印加速度") LCD_STR_I;
LSTR MSG_AMAX_J = _UxGT("最大打印加速度") LCD_STR_J;
LSTR MSG_AMAX_K = _UxGT("最大打印加速度") LCD_STR_K;
LSTR MSG_AMAX_E = _UxGT("最大打印加速度") LCD_STR_E;
LSTR MSG_AMAX_A = _UxGT("最大打印加速度") STR_A; // "Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
LSTR MSG_AMAX_B = _UxGT("最大打印加速度") STR_B;
LSTR MSG_AMAX_C = _UxGT("最大打印加速度") STR_C;
LSTR MSG_AMAX_N = _UxGT("最大打印加速度@");
LSTR MSG_AMAX_E = _UxGT("最大打印加速度E");
LSTR MSG_AMAX_EN = _UxGT("最大打印加速度 *");
LSTR MSG_A_RETRACT = _UxGT("收进加速度"); // "A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
LSTR MSG_A_TRAVEL = _UxGT("非打印移动加速度"); // "A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("频率最大");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("进给速度");
LSTR MSG_STEPS_PER_MM = _UxGT("轴步数/mm"); // "Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
LSTR MSG_A_STEPS = LCD_STR_A _UxGT(" 步数/mm"); // "Asteps/mm"
LSTR MSG_B_STEPS = LCD_STR_B _UxGT(" 步数/mm");
LSTR MSG_C_STEPS = LCD_STR_C _UxGT(" 步数/mm");
LSTR MSG_I_STEPS = LCD_STR_I _UxGT(" 步数/mm");
LSTR MSG_J_STEPS = LCD_STR_J _UxGT(" 步数/mm");
LSTR MSG_K_STEPS = LCD_STR_K _UxGT(" 步数/mm");
LSTR MSG_A_STEPS = STR_A _UxGT(" 步数/mm"); // "Asteps/mm"
LSTR MSG_B_STEPS = STR_B _UxGT(" 步数/mm");
LSTR MSG_C_STEPS = STR_C _UxGT(" 步数/mm");
LSTR MSG_N_STEPS = _UxGT("@ 步数/mm");
LSTR MSG_E_STEPS = _UxGT("E 步数/mm"); // "Esteps/mm"
LSTR MSG_EN_STEPS = _UxGT("* 步数/mm");
LSTR MSG_TEMPERATURE = _UxGT("温度"); // "Temperature"
@@ -463,8 +455,6 @@ namespace Language_zh_CN {
LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("⊿校准中心"); // "Calibrate Center"
LSTR MSG_DELTA_SETTINGS = _UxGT("⊿设置"); // "Delta Settings"
LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("⊿自动校准"); // "Auto Calibration"
LSTR MSG_DELTA_HEIGHT_CALIBRATE = _UxGT("设置⊿高度"); // "Set Delta Height"
LSTR MSG_DELTA_Z_OFFSET_CALIBRATE = _UxGT("探针Z偏移量");
LSTR MSG_DELTA_DIAG_ROD = _UxGT("⊿斜柱"); // "Diag Rod"
LSTR MSG_DELTA_HEIGHT = _UxGT("⊿高度"); // "Height"
LSTR MSG_DELTA_RADIUS = _UxGT("⊿半径"); // "Radius"
@@ -490,7 +480,7 @@ namespace Language_zh_CN {
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("打印机不正确"); // "The printer is incorrect"
#if LCD_WIDTH >= 20
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_INFO_PRINT_COUNT = _UxGT("打印计数"); // "Print Count"
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("完成了"); // "Completed"
LSTR MSG_INFO_PRINT_TIME = _UxGT("总打印时间"); // "Total print time"
@@ -508,13 +498,7 @@ namespace Language_zh_CN {
LSTR MSG_INFO_MAX_TEMP = _UxGT("最高温度"); // "Max Temp"
LSTR MSG_INFO_PSU = _UxGT("电源供应"); // "Power Supply"
LSTR MSG_DRIVE_STRENGTH = _UxGT("驱动力度"); // "Drive Strength"
LSTR MSG_DAC_PERCENT_A = LCD_STR_A _UxGT(" 驱动 %"); // "X Driver %"
LSTR MSG_DAC_PERCENT_B = LCD_STR_B _UxGT(" 驱动 %");
LSTR MSG_DAC_PERCENT_C = LCD_STR_C _UxGT(" 驱动 %");
LSTR MSG_DAC_PERCENT_I = LCD_STR_I _UxGT(" 驱动 %");
LSTR MSG_DAC_PERCENT_J = LCD_STR_J _UxGT(" 驱动 %");
LSTR MSG_DAC_PERCENT_K = LCD_STR_K _UxGT(" 驱动 %");
LSTR MSG_DAC_PERCENT_E = _UxGT("E 驱动 %"); // "E Driver %"
LSTR MSG_DAC_PERCENT_N = _UxGT("@ 驱动 %"); // "E Driver %"
LSTR MSG_ERROR_TMC = _UxGT("TMC 连接错误");
LSTR MSG_DAC_EEPROM_WRITE = _UxGT("保存驱动设置"); // "DAC EEPROM Write"
LSTR MSG_FILAMENT_CHANGE_HEADER = _UxGT("更换料");