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

23
Marlin/src/lcd/language/language_ca.h
View File

@@ -53,8 +53,7 @@ namespace Language_ca {
LSTR MSG_LEVEL_BED_DONE = _UxGT("Anivellament fet!");
LSTR MSG_SET_HOME_OFFSETS = _UxGT("Ajusta decalatge");
LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Decalatge aplicat");
LSTR MSG_SET_ORIGIN = _UxGT("Estableix origen");
#if PREHEAT_COUNT
#if HAS_PREHEAT
LSTR MSG_PREHEAT_1 = _UxGT("Preescalfa ") PREHEAT_1_LABEL;
LSTR MSG_PREHEAT_1_H = _UxGT("Preescalfa ") PREHEAT_1_LABEL " ~";
LSTR MSG_PREHEAT_1_END = _UxGT("Preescalfa ") PREHEAT_1_LABEL _UxGT(" End");
@@ -84,9 +83,10 @@ namespace Language_ca {
LSTR MSG_MOVE_X = _UxGT("Mou X");
LSTR MSG_MOVE_Y = _UxGT("Mou Y");
LSTR MSG_MOVE_Z = _UxGT("Mou Z");
LSTR MSG_MOVE_N = _UxGT("Mou @");
LSTR MSG_MOVE_E = _UxGT("Extrusor");
LSTR MSG_MOVE_EN = _UxGT("Extrusor *");
LSTR MSG_MOVE_N_MM = _UxGT("Mou %smm");
LSTR MSG_MOVE_N_MM = _UxGT("Mou $mm");
LSTR MSG_MOVE_01MM = _UxGT("Mou 0.1mm");
LSTR MSG_MOVE_1MM = _UxGT("Mou 1mm");
LSTR MSG_MOVE_10MM = _UxGT("Mou 10mm");
@@ -105,14 +105,12 @@ namespace Language_ca {
LSTR MSG_A_RETRACT = _UxGT("Accel. retracc");
LSTR MSG_A_TRAVEL = _UxGT("Accel. Viatge");
LSTR MSG_STEPS_PER_MM = _UxGT("Passos/mm");
LSTR MSG_A_STEPS = LCD_STR_A _UxGT(" passos/mm");
LSTR MSG_B_STEPS = LCD_STR_B _UxGT(" passos/mm");
LSTR MSG_C_STEPS = LCD_STR_C _UxGT(" passos/mm");
LSTR MSG_I_STEPS = LCD_STR_I _UxGT(" passos/mm");
LSTR MSG_J_STEPS = LCD_STR_J _UxGT(" passos/mm");
LSTR MSG_K_STEPS = LCD_STR_K _UxGT(" passos/mm");
LSTR MSG_E_STEPS = _UxGT("Epassos/mm");
LSTR MSG_EN_STEPS = _UxGT("*passos/mm");
LSTR MSG_A_STEPS = STR_A _UxGT(" passos/mm");
LSTR MSG_B_STEPS = STR_B _UxGT(" passos/mm");
LSTR MSG_C_STEPS = STR_C _UxGT(" passos/mm");
LSTR MSG_E_STEPS = _UxGT("@ passos/mm");
LSTR MSG_N_STEPS = _UxGT("E passos/mm");
LSTR MSG_EN_STEPS = _UxGT("* passos/mm");
LSTR MSG_TEMPERATURE = _UxGT("Temperatura");
LSTR MSG_MOTION = _UxGT("Moviment");
LSTR MSG_FILAMENT = _UxGT("Filament");
@@ -157,6 +155,7 @@ namespace Language_ca {
LSTR MSG_BABYSTEP_X = _UxGT("Micropas X");
LSTR MSG_BABYSTEP_Y = _UxGT("Micropas Y");
LSTR MSG_BABYSTEP_Z = _UxGT("Micropas Z");
LSTR MSG_BABYSTEP_N = _UxGT("Micropas @");
LSTR MSG_ENDSTOP_ABORT = _UxGT("Cancel. Endstop");
LSTR MSG_HEATING_FAILED_LCD = _UxGT("Error al escalfar");
LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Err: TEMP REDUNDANT");
@@ -183,7 +182,7 @@ namespace Language_ca {
LSTR MSG_INFO_PROTOCOL = _UxGT("Protocol");
LSTR MSG_CASE_LIGHT = _UxGT("Llum");
#if LCD_WIDTH >= 20
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Total impressions");
LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Acabades");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Temps imprimint");