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

@@ -68,8 +68,7 @@ namespace Language_ro {
LSTR MSG_Z_FADE_HEIGHT = _UxGT("Fade Inaltime");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Seteaza Offseturile Acasa");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offseturi Aplicate");
LSTR MSG_SET_ORIGIN = _UxGT("Seteaza Originea");
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_PREHEAT_1 = _UxGT("Preincalzeste ") PREHEAT_1_LABEL;
LSTR MSG_PREHEAT_1_H = _UxGT("Preincalzeste ") PREHEAT_1_LABEL " ~";
LSTR MSG_PREHEAT_1_END = _UxGT("Preincalzeste ") PREHEAT_1_LABEL _UxGT(" Capatul");
@@ -120,9 +119,8 @@ namespace Language_ro {
LSTR MSG_IDEX_MODE_DUPLICATE = _UxGT("Duplication");
LSTR MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("Mirrored Copy");
LSTR MSG_IDEX_MODE_FULL_CTRL = _UxGT("Full Control");
LSTR MSG_HOTEND_OFFSET_X = _UxGT("2nd Nozzle X");
LSTR MSG_HOTEND_OFFSET_Y = _UxGT("2nd Nozzle Y");
LSTR MSG_HOTEND_OFFSET_Z = _UxGT("2nd Nozzle Z");
LSTR MSG_HOTEND_OFFSET_A = _UxGT("2nd Nozzle @");
LSTR MSG_UBL_DOING_G29 = _UxGT("Doing G29");
LSTR MSG_UBL_TOOLS = _UxGT("UBL Tools");
LSTR MSG_UBL_LEVEL_BED = _UxGT("Unified Bed Leveling");
@@ -144,7 +142,7 @@ namespace Language_ro {
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 Mesh ($)");
LSTR MSG_UBL_VALIDATE_MESH_M = _UxGT("Validate Mesh ($)");
#endif
@@ -224,10 +222,11 @@ namespace Language_ro {
LSTR MSG_MOVE_X = _UxGT("Move X");
LSTR MSG_MOVE_Y = _UxGT("Move Y");
LSTR MSG_MOVE_Z = _UxGT("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("Capat Prea Rece");
LSTR MSG_MOVE_N_MM = _UxGT("Move %smm");
LSTR MSG_MOVE_N_MM = _UxGT("Move $mm");
LSTR MSG_MOVE_01MM = _UxGT("Move 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Move 1mm");
LSTR MSG_MOVE_10MM = _UxGT("Move 10mm");
@@ -262,54 +261,46 @@ namespace Language_ro {
LSTR MSG_PID_AUTOTUNE = _UxGT("PID Autotune");
LSTR MSG_PID_AUTOTUNE_E = _UxGT("PID Autotune *");
LSTR MSG_PID_AUTOTUNE_DONE = _UxGT("PID tuning done");
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune failed. Bad extruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed. Temperature too high.");
LSTR MSG_PID_BAD_EXTRUDER_NUM = _UxGT("Autotune failed! Bad extruder.");
LSTR MSG_PID_TEMP_TOO_HIGH = _UxGT("Autotune failed! Temperature too high.");
LSTR MSG_PID_TIMEOUT = _UxGT("Autotune failed! Timeout.");
LSTR MSG_SELECT = _UxGT("Select");
LSTR MSG_SELECT_E = _UxGT("Select *");
LSTR MSG_ACC = _UxGT("Accel");
LSTR MSG_JERK = _UxGT("Jerk");
LSTR MSG_VA_JERK = _UxGT("V") LCD_STR_A _UxGT("-Jerk");
LSTR MSG_VB_JERK = _UxGT("V") LCD_STR_B _UxGT("-Jerk");
LSTR MSG_VC_JERK = _UxGT("V") LCD_STR_C _UxGT("-Jerk");
LSTR MSG_VI_JERK = _UxGT("V") LCD_STR_I _UxGT("-Jerk");
LSTR MSG_VJ_JERK = _UxGT("V") LCD_STR_J _UxGT("-Jerk");
LSTR MSG_VK_JERK = _UxGT("V") LCD_STR_K _UxGT("-Jerk");
LSTR MSG_VA_JERK = _UxGT("V") STR_A _UxGT("-Jerk");
LSTR MSG_VB_JERK = _UxGT("V") STR_B _UxGT("-Jerk");
LSTR MSG_VC_JERK = _UxGT("V") STR_C _UxGT("-Jerk");
LSTR MSG_VN_JERK = _UxGT("V@-Jerk");
LSTR MSG_VE_JERK = _UxGT("Ve-Jerk");
LSTR MSG_JUNCTION_DEVIATION = _UxGT("Junction Dev");
LSTR MSG_VELOCITY = _UxGT("Velocity");
LSTR MSG_VMAX_A = _UxGT("Vmax ") LCD_STR_A;
LSTR MSG_VMAX_B = _UxGT("Vmax ") LCD_STR_B;
LSTR MSG_VMAX_C = _UxGT("Vmax ") LCD_STR_C;
LSTR MSG_VMAX_I = _UxGT("Vmax ") LCD_STR_I;
LSTR MSG_VMAX_J = _UxGT("Vmax ") LCD_STR_J;
LSTR MSG_VMAX_K = _UxGT("Vmax ") LCD_STR_K;
LSTR MSG_VMAX_E = _UxGT("Vmax ") LCD_STR_E;
LSTR MSG_VMAX_EN = _UxGT("Vmax *");
LSTR MSG_MAX_SPEED = _UxGT("Max Speed");
LSTR MSG_VMAX_A = _UxGT("Max Speed ") STR_A;
LSTR MSG_VMAX_B = _UxGT("Max Speed ") STR_B;
LSTR MSG_VMAX_C = _UxGT("Max Speed ") STR_C;
LSTR MSG_VMAX_N = _UxGT("Max Speed @");
LSTR MSG_VMAX_E = _UxGT("Max Speed E");
LSTR MSG_VMAX_EN = _UxGT("Max Speed *");
LSTR MSG_VMIN = _UxGT("Vmin");
LSTR MSG_VTRAV_MIN = _UxGT("VTrav Min");
LSTR MSG_ACCELERATION = _UxGT("Acceleration");
LSTR MSG_AMAX_A = _UxGT("Amax ") LCD_STR_A;
LSTR MSG_AMAX_B = _UxGT("Amax ") LCD_STR_B;
LSTR MSG_AMAX_C = _UxGT("Amax ") LCD_STR_C;
LSTR MSG_AMAX_I = _UxGT("Amax ") LCD_STR_I;
LSTR MSG_AMAX_J = _UxGT("Amax ") LCD_STR_J;
LSTR MSG_AMAX_K = _UxGT("Amax ") LCD_STR_K;
LSTR MSG_AMAX_E = _UxGT("Amax ") LCD_STR_E;
LSTR MSG_AMAX_A = _UxGT("Amax ") STR_A;
LSTR MSG_AMAX_B = _UxGT("Amax ") STR_B;
LSTR MSG_AMAX_C = _UxGT("Amax ") STR_C;
LSTR MSG_AMAX_N = _UxGT("Amax @");
LSTR MSG_AMAX_E = _UxGT("Amax E");
LSTR MSG_AMAX_EN = _UxGT("Amax *");
LSTR MSG_A_RETRACT = _UxGT("A-Retract");
LSTR MSG_A_TRAVEL = _UxGT("A-Travel");
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("Frequency max");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Feed min");
LSTR MSG_STEPS_PER_MM = _UxGT("Steps/mm");
LSTR MSG_A_STEPS = LCD_STR_A _UxGT(" steps/mm");
LSTR MSG_B_STEPS = LCD_STR_B _UxGT(" steps/mm");
LSTR MSG_C_STEPS = LCD_STR_C _UxGT(" steps/mm");
LSTR MSG_I_STEPS = LCD_STR_I _UxGT(" steps/mm");
LSTR MSG_J_STEPS = LCD_STR_J _UxGT(" steps/mm");
LSTR MSG_K_STEPS = LCD_STR_K _UxGT(" steps/mm");
LSTR MSG_E_STEPS = _UxGT("Esteps/mm");
LSTR MSG_EN_STEPS = _UxGT("*steps/mm");
LSTR MSG_A_STEPS = STR_A _UxGT(" steps/mm");
LSTR MSG_B_STEPS = STR_B _UxGT(" steps/mm");
LSTR MSG_C_STEPS = STR_C _UxGT(" steps/mm");
LSTR MSG_N_STEPS = _UxGT("@ steps/mm");
LSTR MSG_E_STEPS = _UxGT("E steps/mm");
LSTR MSG_EN_STEPS = _UxGT("* steps/mm");
LSTR MSG_TEMPERATURE = _UxGT("Temperature");
LSTR MSG_MOTION = _UxGT("Motion");
LSTR MSG_FILAMENT = _UxGT("Filament");
@@ -437,6 +428,7 @@ namespace Language_ro {
LSTR MSG_BABYSTEP_X = _UxGT("Babystep X");
LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y");
LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z");
LSTR MSG_BABYSTEP_N = _UxGT("Babystep @");
LSTR MSG_BABYSTEP_TOTAL = _UxGT("Total");
LSTR MSG_ENDSTOP_ABORT = _UxGT("Endstop Abort");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Heating Failed");
@@ -461,8 +453,6 @@ namespace Language_ro {
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("Probe Z-offset");
LSTR MSG_DELTA_DIAG_ROD = _UxGT("Diag Rod");
LSTR MSG_DELTA_HEIGHT = _UxGT("Inaltime");
LSTR MSG_DELTA_RADIUS = _UxGT("Radius");
@@ -487,7 +477,7 @@ namespace Language_ro {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Light Brightness");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("INCORRECT PRINTER");
#if LCD_WIDTH >= 20
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Total Printuri");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completat");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Timp Imprimare Total");
@@ -505,13 +495,7 @@ namespace Language_ro {
LSTR MSG_INFO_MAX_TEMP = _UxGT("Temperatura Maxima");
LSTR MSG_INFO_PSU = _UxGT("PSU");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Drive Strength");
LSTR MSG_DAC_PERCENT_A = LCD_STR_A _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_B = LCD_STR_B _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_C = LCD_STR_C _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_I = LCD_STR_I _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_J = LCD_STR_J _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_K = LCD_STR_K _UxGT(" Driver %");
LSTR MSG_DAC_PERCENT_E = _UxGT("E Driver %");
LSTR MSG_DAC_PERCENT_N = _UxGT("@ Driver %");
LSTR MSG_ERROR_TMC = _UxGT("TMC CONNECTION ERROR");
LSTR MSG_DAC_EEPROM_WRITE = _UxGT("DAC EEPROM Write");
LSTR MSG_FILAMENT_CHANGE_HEADER = _UxGT("FILAMENT CHANGE");