wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Merge upstream changes from Marlin 2.1.1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

31
Marlin/src/lcd/language/language_an.h
View File

@@ -55,8 +55,7 @@ namespace Language_an {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Nivelacion feita!");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Achustar desfases");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Desfase aplicau");
LSTR MSG_SET_ORIGIN = _UxGT("Establir orichen");
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_PREHEAT_1 = _UxGT("Precalentar ") PREHEAT_1_LABEL;
LSTR MSG_PREHEAT_1_H = _UxGT("Precalentar ") PREHEAT_1_LABEL " ~";
LSTR MSG_PREHEAT_1_END = _UxGT("Precal. ") PREHEAT_1_LABEL _UxGT(" Boquilla");
@@ -84,9 +83,10 @@ namespace Language_an {
LSTR MSG_MOVE_X = _UxGT("Mover X");
LSTR MSG_MOVE_Y = _UxGT("Mover Y");
LSTR MSG_MOVE_Z = _UxGT("Mover Z");
LSTR MSG_MOVE_N = _UxGT("Mover @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_MOVE_N_MM = _UxGT("Mover %smm");
LSTR MSG_MOVE_N_MM = _UxGT("Mover $mm");
LSTR MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Mover 1mm");
LSTR MSG_MOVE_10MM = _UxGT("Mover 10mm");
@@ -107,23 +107,19 @@ namespace Language_an {
LSTR MSG_ACC = _UxGT("Aceleracion");
LSTR MSG_VTRAV_MIN = _UxGT("Vel. viache min");
LSTR MSG_ACCELERATION = _UxGT("Accel");
LSTR MSG_AMAX_A = _UxGT("Acel. max ") LCD_STR_A;
LSTR MSG_AMAX_B = _UxGT("Acel. max ") LCD_STR_B;
LSTR MSG_AMAX_C = _UxGT("Acel. max ") LCD_STR_C;
LSTR MSG_AMAX_I = _UxGT("Acel. max ") LCD_STR_I;
LSTR MSG_AMAX_J = _UxGT("Acel. max ") LCD_STR_J;
LSTR MSG_AMAX_K = _UxGT("Acel. max ") LCD_STR_K;
LSTR MSG_AMAX_E = _UxGT("Acel. max ") LCD_STR_E;
LSTR MSG_AMAX_A = _UxGT("Acel. max ") STR_A;
LSTR MSG_AMAX_B = _UxGT("Acel. max ") STR_B;
LSTR MSG_AMAX_C = _UxGT("Acel. max ") STR_C;
LSTR MSG_AMAX_N = _UxGT("Acel. max @");
LSTR MSG_AMAX_E = _UxGT("Acel. max E");
LSTR MSG_AMAX_EN = _UxGT("Acel. max *");
LSTR MSG_A_RETRACT = _UxGT("Acel. retrac.");
LSTR MSG_A_TRAVEL = _UxGT("Acel. Viaje");
LSTR MSG_STEPS_PER_MM = _UxGT("Trangos/mm");
LSTR MSG_A_STEPS = LCD_STR_A _UxGT(" trangos/mm");
LSTR MSG_B_STEPS = LCD_STR_B _UxGT(" trangos/mm");
LSTR MSG_C_STEPS = LCD_STR_C _UxGT(" trangos/mm");
LSTR MSG_I_STEPS = LCD_STR_I _UxGT(" trangos/mm");
LSTR MSG_J_STEPS = LCD_STR_J _UxGT(" trangos/mm");
LSTR MSG_K_STEPS = LCD_STR_K _UxGT(" trangos/mm");
LSTR MSG_A_STEPS = STR_A _UxGT(" trangos/mm");
LSTR MSG_B_STEPS = STR_B _UxGT(" trangos/mm");
LSTR MSG_C_STEPS = STR_C _UxGT(" trangos/mm");
LSTR MSG_N_STEPS = _UxGT("@ trangos/mm");
LSTR MSG_E_STEPS = _UxGT("E trangos/mm");
LSTR MSG_EN_STEPS = _UxGT("* trangos/mm");
LSTR MSG_TEMPERATURE = _UxGT("Temperatura");
@@ -169,6 +165,7 @@ namespace Language_an {
LSTR MSG_BABYSTEP_X = _UxGT("Micropaso X");
LSTR MSG_BABYSTEP_Y = _UxGT("Micropaso Y");
LSTR MSG_BABYSTEP_Z = _UxGT("Micropaso Z");
LSTR MSG_BABYSTEP_N = _UxGT("Micropaso @");
LSTR MSG_ENDSTOP_ABORT = _UxGT("Cancelado - Endstop");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Error: en calentar");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Error: temperatura");
@@ -195,7 +192,7 @@ namespace Language_an {
LSTR MSG_INFO_PROTOCOL = _UxGT("Protocolo");
LSTR MSG_CASE_LIGHT = _UxGT("Luz");
#if LCD_WIDTH >= 20
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Conteo de impresion");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completadas");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Tiempo total d'imp.");