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

@@ -58,12 +58,10 @@ namespace Language_fr {
LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barre progress.");
LSTR MSG_HOMING = _UxGT("Origine");
LSTR MSG_AUTO_HOME = _UxGT("Origine auto");
LSTR MSG_AUTO_HOME_A = _UxGT("Origine @ auto");
LSTR MSG_AUTO_HOME_X = _UxGT("Origine X auto");
LSTR MSG_AUTO_HOME_Y = _UxGT("Origine Y auto");
LSTR MSG_AUTO_HOME_Z = _UxGT("Origine Z auto");
LSTR MSG_AUTO_HOME_I = _UxGT("Origine ") LCD_STR_I _UxGT(" auto");
LSTR MSG_AUTO_HOME_J = _UxGT("Origine ") LCD_STR_J _UxGT(" auto");
LSTR MSG_AUTO_HOME_K = _UxGT("Origine ") LCD_STR_K _UxGT(" auto");
LSTR MSG_AUTO_Z_ALIGN = _UxGT("Align. Z auto");
LSTR MSG_LEVEL_BED_HOMING = _UxGT("Origine XYZ...");
LSTR MSG_LEVEL_BED_WAITING = _UxGT("Clic pour commencer");
@@ -74,15 +72,11 @@ namespace Language_fr {
LSTR MSG_HOME_OFFSET_X = _UxGT("Décal. origine X");
LSTR MSG_HOME_OFFSET_Y = _UxGT("Décal. origine Y");
LSTR MSG_HOME_OFFSET_Z = _UxGT("Décal. origine Z");
LSTR MSG_HOME_OFFSET_I = _UxGT("Décal. origine ") LCD_STR_I;
LSTR MSG_HOME_OFFSET_J = _UxGT("Décal. origine ") LCD_STR_J;
LSTR MSG_HOME_OFFSET_K = _UxGT("Décal. origine ") LCD_STR_K;
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Décalages appliqués");
LSTR MSG_SET_ORIGIN = _UxGT("Régler origine");
LSTR MSG_TRAMMING_WIZARD = _UxGT("Assistant Molettes");
LSTR MSG_SELECT_ORIGIN = _UxGT("Molette du lit"); // Not a selection of the origin
LSTR MSG_LAST_VALUE_SP = _UxGT("Ecart origine ");
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_PREHEAT_1 = _UxGT("Préchauffage ") PREHEAT_1_LABEL;
LSTR MSG_PREHEAT_1_H = _UxGT("Préchauffage ") PREHEAT_1_LABEL " ~";
LSTR MSG_PREHEAT_1_END = _UxGT("Préch. ") PREHEAT_1_LABEL _UxGT(" buse");
@@ -113,7 +107,7 @@ namespace Language_fr {
LSTR MSG_LEVEL_BED = _UxGT("Niveau du lit");
LSTR MSG_BED_TRAMMING = _UxGT("Niveau des coins");
LSTR MSG_BED_TRAMMING_RAISE = _UxGT("Relever le coin jusqu'à la sonde");
LSTR MSG_BED_TRAMMING_IN_RANGE = _UxGT("Coins dans la tolérance. Niveau lit ");
LSTR MSG_BED_TRAMMING_IN_RANGE = _UxGT("Coins dans la tolérance. Niveau lit.");
LSTR MSG_NEXT_CORNER = _UxGT("Coin suivant");
LSTR MSG_MESH_EDITOR = _UxGT("Modif. maille"); // 13 car. max
LSTR MSG_EDIT_MESH = _UxGT("Modifier grille");
@@ -134,9 +128,8 @@ namespace Language_fr {
LSTR MSG_IDEX_MODE_MIRRORED_COPY = _UxGT("Copie miroir");
LSTR MSG_IDEX_MODE_FULL_CTRL = _UxGT("Contrôle complet");
LSTR MSG_OFFSETS_MENU = _UxGT("Offsets Outil");
LSTR MSG_HOTEND_OFFSET_X = _UxGT("Buse 2 X");
LSTR MSG_HOTEND_OFFSET_Y = _UxGT("Buse 2 Y");
LSTR MSG_HOTEND_OFFSET_Z = _UxGT("Buse 2 Z");
LSTR MSG_HOTEND_OFFSET_A = _UxGT("Buse 2 @");
LSTR MSG_G26_HEATING_BED = _UxGT("G26: Chauffage du lit");
LSTR MSG_G26_HEATING_NOZZLE = _UxGT("Buse en chauffe...");
LSTR MSG_G26_MANUAL_PRIME = _UxGT("Amorce manuelle...");
@@ -163,7 +156,7 @@ namespace Language_fr {
LSTR MSG_UBL_FINE_TUNE_MESH = _UxGT("Réglage fin");
LSTR MSG_UBL_DONE_EDITING_MESH = _UxGT("Terminer");
LSTR MSG_UBL_BUILD_MESH_MENU = _UxGT("Créer la grille");
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_UBL_BUILD_MESH_M = _UxGT("Créer grille $");
LSTR MSG_UBL_VALIDATE_MESH_M = _UxGT("Impr. grille $");
#endif
@@ -237,13 +230,11 @@ namespace Language_fr {
LSTR MSG_MOVE_X = _UxGT("Déplacer X");
LSTR MSG_MOVE_Y = _UxGT("Déplacer Y");
LSTR MSG_MOVE_Z = _UxGT("Déplacer Z");
LSTR MSG_MOVE_I = _UxGT("Déplacer ") LCD_STR_I;
LSTR MSG_MOVE_J = _UxGT("Déplacer ") LCD_STR_J;
LSTR MSG_MOVE_K = _UxGT("Déplacer ") LCD_STR_K;
LSTR MSG_MOVE_N = _UxGT("Déplacer @");
LSTR MSG_MOVE_E = _UxGT("Extruder");
LSTR MSG_MOVE_EN = _UxGT("Extruder *");
LSTR MSG_HOTEND_TOO_COLD = _UxGT("Buse trop froide");
LSTR MSG_MOVE_N_MM = _UxGT("Déplacer %smm");
LSTR MSG_MOVE_N_MM = _UxGT("Déplacer $mm");
LSTR MSG_MOVE_01MM = _UxGT("Déplacer 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Déplacer 1mm");
LSTR MSG_MOVE_10MM = _UxGT("Déplacer 10mm");
@@ -283,45 +274,37 @@ namespace Language_fr {
LSTR MSG_SELECT_E = _UxGT("Sélectionner *");
LSTR MSG_ACC = _UxGT("Accélération");
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_VELOCITY = _UxGT("Vélocité");
LSTR MSG_VMAX_A = _UxGT("Vit. Max ") LCD_STR_A;
LSTR MSG_VMAX_B = _UxGT("Vit. Max ") LCD_STR_B;
LSTR MSG_VMAX_C = _UxGT("Vit. Max ") LCD_STR_C;
LSTR MSG_VMAX_I = _UxGT("Vit. Max ") LCD_STR_I;
LSTR MSG_VMAX_J = _UxGT("Vit. Max ") LCD_STR_J;
LSTR MSG_VMAX_K = _UxGT("Vit. Max ") LCD_STR_K;
LSTR MSG_VMAX_E = _UxGT("Vit. Max ") LCD_STR_E;
LSTR MSG_MAX_SPEED = _UxGT("Max Vélocité");
LSTR MSG_VMAX_A = _UxGT("Vit. Max ") STR_A;
LSTR MSG_VMAX_B = _UxGT("Vit. Max ") STR_B;
LSTR MSG_VMAX_C = _UxGT("Vit. Max ") STR_C;
LSTR MSG_VMAX_N = _UxGT("Vit. Max @");
LSTR MSG_VMAX_E = _UxGT("Vit. Max E");
LSTR MSG_VMAX_EN = _UxGT("Vit. Max *");
LSTR MSG_JUNCTION_DEVIATION = _UxGT("Déviat. jonct.");
LSTR MSG_VMIN = _UxGT("Vit. Min");
LSTR MSG_VTRAV_MIN = _UxGT("Vmin course");
LSTR MSG_ACCELERATION = _UxGT("Accélération");
LSTR MSG_AMAX_A = _UxGT("Max Accél. ") LCD_STR_A;
LSTR MSG_AMAX_B = _UxGT("Max Accél. ") LCD_STR_B;
LSTR MSG_AMAX_C = _UxGT("Max Accél. ") LCD_STR_C;
LSTR MSG_AMAX_I = _UxGT("Max Accél. ") LCD_STR_I;
LSTR MSG_AMAX_J = _UxGT("Max Accél. ") LCD_STR_J;
LSTR MSG_AMAX_K = _UxGT("Max Accél. ") LCD_STR_K;
LSTR MSG_AMAX_E = _UxGT("Max Accél. ") LCD_STR_E;
LSTR MSG_AMAX_A = _UxGT("Max Accél. ") STR_A;
LSTR MSG_AMAX_B = _UxGT("Max Accél. ") STR_B;
LSTR MSG_AMAX_C = _UxGT("Max Accél. ") STR_C;
LSTR MSG_AMAX_N = _UxGT("Max Accél. @");
LSTR MSG_AMAX_E = _UxGT("Max Accél. E");
LSTR MSG_AMAX_EN = _UxGT("Max Accél. *");
LSTR MSG_A_RETRACT = _UxGT("Acc.rétraction");
LSTR MSG_A_TRAVEL = _UxGT("Acc.course");
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("Fréquence max");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Vitesse min");
LSTR MSG_STEPS_PER_MM = _UxGT("Pas/mm");
LSTR MSG_A_STEPS = LCD_STR_A _UxGT(" pas/mm");
LSTR MSG_B_STEPS = LCD_STR_B _UxGT(" pas/mm");
LSTR MSG_C_STEPS = LCD_STR_C _UxGT(" pas/mm");
LSTR MSG_I_STEPS = LCD_STR_I _UxGT(" pas/mm");
LSTR MSG_J_STEPS = LCD_STR_J _UxGT(" pas/mm");
LSTR MSG_K_STEPS = LCD_STR_K _UxGT(" pas/mm");
LSTR MSG_A_STEPS = STR_A _UxGT(" pas/mm");
LSTR MSG_B_STEPS = STR_B _UxGT(" pas/mm");
LSTR MSG_C_STEPS = STR_C _UxGT(" pas/mm");
LSTR MSG_N_STEPS = _UxGT("@ pas/mm");
LSTR MSG_E_STEPS = _UxGT("E pas/mm");
LSTR MSG_EN_STEPS = _UxGT("* pas/mm");
LSTR MSG_TEMPERATURE = _UxGT("Température");
@@ -338,6 +321,8 @@ namespace Language_fr {
LSTR MSG_ADVANCE_K_E = _UxGT("Avance K *");
LSTR MSG_BRIGHTNESS = _UxGT("Luminosité LCD");
LSTR MSG_CONTRAST = _UxGT("Contraste LCD");
LSTR MSG_LCD_TIMEOUT_SEC = _UxGT("Veille LCD (s)");
LSTR MSG_BRIGHTNESS_OFF = _UxGT("Éteindre l'écran LCD");
LSTR MSG_STORE_EEPROM = _UxGT("Enregistrer config.");
LSTR MSG_LOAD_EEPROM = _UxGT("Charger config.");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("Restaurer défauts");
@@ -445,9 +430,7 @@ namespace Language_fr {
LSTR MSG_BABYSTEP_X = _UxGT("Babystep X");
LSTR MSG_BABYSTEP_Y = _UxGT("Babystep Y");
LSTR MSG_BABYSTEP_Z = _UxGT("Babystep Z");
LSTR MSG_BABYSTEP_I = _UxGT("Babystep ") LCD_STR_I;
LSTR MSG_BABYSTEP_J = _UxGT("Babystep ") LCD_STR_J;
LSTR MSG_BABYSTEP_K = _UxGT("Babystep ") LCD_STR_K;
LSTR MSG_BABYSTEP_N = _UxGT("Babystep @");
LSTR MSG_BABYSTEP_TOTAL = _UxGT("Total");
LSTR MSG_ENDSTOP_ABORT = _UxGT("Butée abandon");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Err de chauffe");
@@ -477,8 +460,6 @@ namespace Language_fr {
LSTR MSG_DELTA_CALIBRATE_CENTER = _UxGT("Calibrer centre");
LSTR MSG_DELTA_SETTINGS = _UxGT("Réglages Delta");
LSTR MSG_DELTA_AUTO_CALIBRATE = _UxGT("Calibration Auto");
LSTR MSG_DELTA_HEIGHT_CALIBRATE = _UxGT("Hauteur Delta");
LSTR MSG_DELTA_Z_OFFSET_CALIBRATE = _UxGT("Delta Z sonde");
LSTR MSG_DELTA_DIAG_ROD = _UxGT("Diagonale");
LSTR MSG_DELTA_HEIGHT = _UxGT("Hauteur");
LSTR MSG_DELTA_RADIUS = _UxGT("Rayon");
@@ -505,7 +486,7 @@ namespace Language_fr {
LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Luminosité");
LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("Imprimante incorrecte");
#if LCD_WIDTH >= 20
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Nbre impressions");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Terminées");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Tps impr. total");
@@ -523,13 +504,7 @@ namespace Language_fr {
LSTR MSG_INFO_MAX_TEMP = _UxGT("Temp Max");
LSTR MSG_INFO_PSU = _UxGT("Alim.");
LSTR MSG_DRIVE_STRENGTH = _UxGT("Puiss. moteur ");
LSTR MSG_DAC_PERCENT_A = _UxGT("Driver ") LCD_STR_A _UxGT(" %");
LSTR MSG_DAC_PERCENT_B = _UxGT("Driver ") LCD_STR_B _UxGT(" %");
LSTR MSG_DAC_PERCENT_C = _UxGT("Driver ") LCD_STR_C _UxGT(" %");
LSTR MSG_DAC_PERCENT_I = _UxGT("Driver ") LCD_STR_I _UxGT(" %");
LSTR MSG_DAC_PERCENT_J = _UxGT("Driver ") LCD_STR_J _UxGT(" %");
LSTR MSG_DAC_PERCENT_K = _UxGT("Driver ") LCD_STR_K _UxGT(" %");
LSTR MSG_DAC_PERCENT_E = _UxGT("Driver E %");
LSTR MSG_DAC_PERCENT_N = _UxGT("Driver @ %");
LSTR MSG_DAC_EEPROM_WRITE = _UxGT("DAC EEPROM sauv.");
LSTR MSG_ERROR_TMC = _UxGT("ERREUR CONNEXION TMC");