thomas
/
marlin
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Remove language strings that only add a number 

This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
Scott Lahteine 10 年前
父节点
ab1ddcd89d
当前提交
c90f2e77d8
共有 14 个文件被更改，包括 154 次插入 和 485 次删除
分列视图 显示文件统计
  1. 4
    28
      Marlin/language_an.h
  2. 4
    27
      Marlin/language_ca.h
  3. 4
    28
      Marlin/language_de.h
  4. 8
    38
      Marlin/language_en.h
  5. 4
    36
      Marlin/language_es.h
  6. 4
    27
      Marlin/language_eu.h
  7. 4
    27
      Marlin/language_fi.h
  8. 4
    28
      Marlin/language_fr.h
  9. 7
    37
      Marlin/language_it.h
  10. 4
    27
      Marlin/language_nl.h
  11. 5
    29
      Marlin/language_pl.h
  12. 39
    67
      Marlin/language_pt.h
  13. 38
    61
      Marlin/language_ru.h
  14. 25
    25
      Marlin/ultralcd.cpp

+ 4
- 28
Marlin/language_an.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Establir zero"
20 20 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Precalentar PLA1"
22 
-#define MSG_PREHEAT_PLA1                    "Precalentar PLA2"
23 
-#define MSG_PREHEAT_PLA2                    "Precalentar PLA3"
24 
-#define MSG_PREHEAT_PLA3                    "Precalentar PLA4"
25 
-#define MSG_PREHEAT_PLA0123                 "Precalentar PLA a"
21 
+#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Precalentar PLA a"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Prec. PLA Base"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Achustar tem. PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Precalentar ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Precalentar ABS1"
30 
-#define MSG_PREHEAT_ABS1                    "Precalentar ABS2"
31 
-#define MSG_PREHEAT_ABS2                    "Precalentar ABS3"
32 
-#define MSG_PREHEAT_ABS3                    "Precalentar ABS4"
33 
-#define MSG_PREHEAT_ABS0123                 "Precalentar ABS a"
26 
+#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Precalentar ABS a"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Prec. ABS Base"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Achustar tem. ABS"
36 30 
 #define MSG_COOLDOWN                        "Enfriar"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Move Y"
44 38 
 #define MSG_MOVE_Z                          "Move Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Move 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Move 10mm"
51 43 
 #define MSG_SPEED                           "Velocidat"
52 44 
 #define MSG_NOZZLE                          "Nozzle"
53 
-#define MSG_NOZZLE1                         "Nozzle2"
54 
-#define MSG_NOZZLE2                         "Nozzle3"
55 45 
 #define MSG_BED                             "Base"
56 46 
 #define MSG_FAN_SPEED                       "Ixoriador"
57 47 
 #define MSG_FLOW                            "Fluxo"
58 
-#define MSG_FLOW0                           "Fluxo 0"
59 
-#define MSG_FLOW1                           "Fluxo 1"
60 
-#define MSG_FLOW2                           "Fluxo 2"
61 48 
 #define MSG_CONTROL                         "Control"
62 49 
 #define MSG_MIN                             "\002 Min"
63 50 
 #define MSG_MAX                             "\002 Max"
 
@@ -132,17 +119,6 @@
132 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
133 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
134 121
135 
-#define MSG_RECTRACT                        "Retraer"
136 
-#define MSG_RECTRACT_WIDE                   "Retraer"
137 
-#define MSG_TEMPERATURE_WIDE                "Temperatura"
138 
-#define MSG_TEMPERATURE_RTN                 "Temperatura"
139 
-#define MSG_MAIN_WIDE                       "Menu Prencipal"
140 
-#define MSG_MOTION_WIDE                     "Movimiento"
141 
-#define MSG_PREPARE_ALT                     "Preparar"
142 
-#define MSG_CONTROL_ARROW                   "Control \x7E"
143 
-#define MSG_RETRACT_ARROW                   "Retraer \x7E"
144 
-#define MSG_STEPPER_RELEASED                "Desacoplada."
145 
-
146 122 
 #ifdef DELTA_CALIBRATION_MENU
147 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
148 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 27
Marlin/language_ca.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Establir origen"
20 20 
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Preescalfar PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Preescalfar PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Preescalfar PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Preescalfar PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Preesc. tot PLA"
21 
+#define MSG_PREHEAT_PLA_N                   "Preescalfar PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Preesc. tot PLA"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Preesc. llit PLA"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Configuració PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Preescalfar ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Preescalfar ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Preescalfar ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Preescalfar ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Preescalfar ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Preesc. tot ABS"
26 
+#define MSG_PREHEAT_ABS_N                   "Preescalfar ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Preesc. tot ABS"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Preesc. llit ABS"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Configuració ABS"
36 30 
 #define MSG_COOLDOWN                        "Refredar"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Moure Y"
44 38 
 #define MSG_MOVE_Z                          "Moure Z"
45 39 
 #define MSG_MOVE_E                          "Extrusor"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Moure 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Moure 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Moure 10mm"
51 43 
 #define MSG_SPEED                           "Velocitat"
52 44 
 #define MSG_NOZZLE                          "Nozzle"
53 
-#define MSG_NOZZLE1                         "Nozzle2"
54 
-#define MSG_NOZZLE2                         "Nozzle3"
55 45 
 #define MSG_BED                             "Llit"
56 46 
 #define MSG_FAN_SPEED                       "Vel. Ventilador"
57 47 
 #define MSG_FLOW                            "Fluxe"
58 
-#define MSG_FLOW0                           "Fluxe 0"
59 
-#define MSG_FLOW1                           "Fluxe 1"
60 
-#define MSG_FLOW2                           "Fluxe 2"
61 48 
 #define MSG_CONTROL                         "Control"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Accel"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,8 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
142 121
143 
-#define MSG_RECTRACT                        "Retreure"
144 
-
145 122 
 #ifdef DELTA_CALIBRATION_MENU
146 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
147 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 28
Marlin/language_de.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Setze Nullpunkt"
20 20 
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Vorwärmen PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Vorwärmen PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Vorwärmen PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Vorwärmen PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Vorw. PLA Alle"
21 
+#define MSG_PREHEAT_PLA_N                   "Vorwärmen PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Vorw. PLA Alle"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Vorw. PLA Bett"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Vorwärm. PLA Ein."
28 25 
 #define MSG_PREHEAT_ABS                     "Vorwärmen ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Vorwärmen ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Vorwärmen ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Vorwärmen ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Vorwärmen ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Vorw. ABS Alle"
26 
+#define MSG_PREHEAT_ABS_N                   "Vorwärmen ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Vorw. ABS Alle"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Vorw. ABS Bett"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Vorwärm. ABS Ein."
36 30 
 #define MSG_COOLDOWN                        "Abkühlen"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Y bewegen"
44 38 
 #define MSG_MOVE_Z                          "Z bewegen"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "0.1mm bewegen"
49 41 
 #define MSG_MOVE_1MM                        "1mm bewegen"
50 42 
 #define MSG_MOVE_10MM                       "10mm bewegen"
51 43 
 #define MSG_SPEED                           "Geschw"
52 44 
 #define MSG_NOZZLE                          "Düse"
53 
-#define MSG_NOZZLE1                         "Düse2"
54 
-#define MSG_NOZZLE2                         "Düse3"
55 45 
 #define MSG_BED                             "Bett"
56 46 
 #define MSG_FAN_SPEED                       "Lüftergeschw."
57 47 
 #define MSG_FLOW                            "Fluss"
58 
-#define MSG_FLOW0                           "Fluss 0"
59 
-#define MSG_FLOW1                           "Fluss 1"
60 
-#define MSG_FLOW2                           "Fluss 2"
61 48 
 #define MSG_CONTROL                         "Einstellungen"
62 49 
 #define MSG_MIN                             "\002 Min"
63 50 
 #define MSG_MAX                             "\002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Acc"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,9 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
142 121
143 
-#define MSG_STEPPER_RELEASED                "Stepper frei"
144 
-#define MSG_RECTRACT_WIDE                   "Rectract"
145 
-
146 122 
 #ifdef DELTA_CALIBRATION_MENU
147 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
148 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 8
- 38
Marlin/language_en.h 查看文件 

@@ -18,21 +18,15 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Set origin"
20 20 
 #define MSG_PREHEAT_PLA                     "Preheat PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Preheat PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Preheat PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Preheat PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Preheat PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Preheat PLA All"
26 
-#define MSG_PREHEAT_PLA_BEDONLY             "Preheat PLA Bed"
27 
-#define MSG_PREHEAT_PLA_SETTINGS            "Preheat PLA conf"
21 
+#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
22 
+#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
23 
+#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
24 
+#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " conf"
28 25 
 #define MSG_PREHEAT_ABS                     "Preheat ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Preheat ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Preheat ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Preheat ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Preheat ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Preheat ABS All"
34 
-#define MSG_PREHEAT_ABS_BEDONLY             "Preheat ABS Bed"
35 
-#define MSG_PREHEAT_ABS_SETTINGS            "Preheat ABS conf"
26 
+#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
27 
+#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
28 
+#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
29 
+#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
36 30 
 #define MSG_COOLDOWN                        "Cooldown"
37 31 
 #define MSG_SWITCH_PS_ON                    "Switch power on"
38 32 
 #define MSG_SWITCH_PS_OFF                   "Switch power off"
 
@@ -43,24 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Move Y"
44 38 
 #define MSG_MOVE_Z                          "Move Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 
-#define MSG_MOVE_E3                         "Extruder4"
49 40 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
50 41 
 #define MSG_MOVE_1MM                        "Move 1mm"
51 42 
 #define MSG_MOVE_10MM                       "Move 10mm"
52 43 
 #define MSG_SPEED                           "Speed"
53 44 
 #define MSG_NOZZLE                          "Nozzle"
54 
-#define MSG_NOZZLE1                         "Nozzle2"
55 
-#define MSG_NOZZLE2                         "Nozzle3"
56 
-#define MSG_NOZZLE3                         "Nozzle4"
57 45 
 #define MSG_BED                             "Bed"
58 46 
 #define MSG_FAN_SPEED                       "Fan speed"
59 47 
 #define MSG_FLOW                            "Flow"
60 
-#define MSG_FLOW0                           "Flow 0"
61 
-#define MSG_FLOW1                           "Flow 1"
62 
-#define MSG_FLOW2                           "Flow 2"
63 
-#define MSG_FLOW3                           "Flow 3"
64 48 
 #define MSG_CONTROL                         "Control"
65 49 
 #define MSG_MIN                             " \002 Min"
66 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -72,18 +56,6 @@
72 56 
 #define MSG_PID_I                           "PID-I"
73 57 
 #define MSG_PID_D                           "PID-D"
74 58 
 #define MSG_PID_C                           "PID-C"
75 
-#define MSG_PID_P1                          "PID-P E2"
76 
-#define MSG_PID_I1                          "PID-I E2"
77 
-#define MSG_PID_D1                          "PID-D E2"
78 
-#define MSG_PID_C1                          "PID-C E2"
79 
-#define MSG_PID_P2                          "PID-P E3"
80 
-#define MSG_PID_I2                          "PID-I E3"
81 
-#define MSG_PID_D2                          "PID-D E3"
82 
-#define MSG_PID_C2                          "PID-C E3"
83 
-#define MSG_PID_P3                          "PID-P E4"
84 
-#define MSG_PID_I3                          "PID-I E4"
85 
-#define MSG_PID_D3                          "PID-D E4"
86 
-#define MSG_PID_C3                          "PID-C E4"
87 59 
 #define MSG_ACC                             "Accel"
88 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
89 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -148,8 +120,6 @@
148 120 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
149 121 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
150 122
151 
-#define MSG_RECTRACT                        "Rectract"
152 
-
153 123 
 #ifdef DELTA_CALIBRATION_MENU
154 124 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
155 125 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 36
Marlin/language_es.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Establecer cero"
20 20 
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Precalentar PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Precalentar PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Precalentar PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Precalentar PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Precal. PLA Todo"
21 
+#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Precal. PLA Todo"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Precal. PLA Base"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Ajustar temp. PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Precalentar ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Precalentar ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Precalentar ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Precalentar ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Precalentar ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Precal. ABS Todo"
26 
+#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Precal. ABS Todo"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Precal. ABS Base"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Ajustar temp. ABS"
36 30 
 #define MSG_COOLDOWN                        "Enfriar"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Mover Y"
44 38 
 #define MSG_MOVE_Z                          "Mover Z"
45 39 
 #define MSG_MOVE_E                          "Extrusor"
46 
-#define MSG_MOVE_E1                         "Extrusor2"
47 
-#define MSG_MOVE_E2                         "Extrusor3"
48 40 
 #define MSG_MOVE_01MM                       "Mover 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Mover 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Mover 10mm"
51 43 
 #define MSG_SPEED                           "Velocidad"
52 44 
 #define MSG_NOZZLE                          "Nozzle"
53 
-#define MSG_NOZZLE1                         "Nozzle2"
54 
-#define MSG_NOZZLE2                         "Nozzle3"
55 45 
 #define MSG_BED                             "Base"
56 46 
 #define MSG_FAN_SPEED                       "Ventilador"
57 47 
 #define MSG_FLOW                            "Flujo"
58 
-#define MSG_FLOW0                           "Flujo 0"
59 
-#define MSG_FLOW1                           "Flujo 1"
60 
-#define MSG_FLOW2                           "Flujo 2"
61 48 
 #define MSG_CONTROL                         "Control"
62 49 
 #define MSG_MIN                             "\002 Min"
63 50 
 #define MSG_MAX                             "\002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Acel"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,17 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
142 121
143 
-#define MSG_RECTRACT                        "Retraer"
144 
-#define MSG_RECTRACT_WIDE                   "Retraer"
145 
-#define MSG_TEMPERATURE_WIDE                "Temperatura"
146 
-#define MSG_TEMPERATURE_RTN                 "Temperatura"
147 
-#define MSG_MAIN_WIDE                       "Menu principal"
148 
-#define MSG_MOTION_WIDE                     "Movimiento"
149 
-#define MSG_PREPARE_ALT                     "Preparar"
150 
-#define MSG_CONTROL_ARROW                   "Control \x7E"
151 
-#define MSG_RETRACT_ARROW                   "Retraer \x7E"
152 
-#define MSG_STEPPER_RELEASED                "Desacoplada."
153 
-
154 122 
 #ifdef DELTA_CALIBRATION_MENU
155 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
156 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 27
Marlin/language_eu.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
20 20 
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Aurreberotu PLA1"
22 
-#define MSG_PREHEAT_PLA1                    "Aurreberotu PLA2"
23 
-#define MSG_PREHEAT_PLA2                    "Aurreberotu PLA3"
24 
-#define MSG_PREHEAT_PLA3                    "Aurreberotu PLA4"
25 
-#define MSG_PREHEAT_PLA0123                 "Berotu PLA Guztia"
21 
+#define MSG_PREHEAT_PLA_N                   "Aurreberotu PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Berotu PLA Guztia"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Berotu PLA Ohea"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Berotu PLA Konfig"
28 25 
 #define MSG_PREHEAT_ABS                     "Aurreberotu ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Aurreberotu ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Aurreberotu ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Aurreberotu ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Aurreberotu ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Berotu ABS Guztia"
26 
+#define MSG_PREHEAT_ABS_N                   "Aurreberotu ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Berotu ABS Guztia"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Berotu ABS Ohea"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Berotu ABS Konfig"
36 30 
 #define MSG_COOLDOWN                        "Hoztu"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Mugitu Y"
44 38 
 #define MSG_MOVE_Z                          "Mugitu Z"
45 39 
 #define MSG_MOVE_E                          "Estrusorea"
46 
-#define MSG_MOVE_E1                         "Estrusorea2"
47 
-#define MSG_MOVE_E2                         "Estrusorea3"
48 40 
 #define MSG_MOVE_01MM                       "Mugitu 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Mugitu 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Mugitu 10mm"
51 43 
 #define MSG_SPEED                           "Abiadura"
52 44 
 #define MSG_NOZZLE                          "Pita"
53 
-#define MSG_NOZZLE1                         "Pita2"
54 
-#define MSG_NOZZLE2                         "Pita3"
55 45 
 #define MSG_BED                             "Ohea"
56 46 
 #define MSG_FAN_SPEED                       "Haizagailua"
57 47 
 #define MSG_FLOW                            "Fluxua"
58 
-#define MSG_FLOW0                           "Fluxua 0"
59 
-#define MSG_FLOW1                           "Fluxua 1"
60 
-#define MSG_FLOW2                           "Fluxua 2"
61 48 
 #define MSG_CONTROL                         "Kontrola"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Azelerazioa"
81 60 
 #define MSG_VXY_JERK                        "Vxy-astindua"
82 61 
 #define MSG_VZ_JERK                         "Vz-astindua"
 
@@ -140,8 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop deuseztat"
142 121
143 
-#define MSG_RECTRACT                        "Atzera eragin"
144 
-
145 122 
 #ifdef DELTA_CALIBRATION_MENU
146 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
147 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 27
Marlin/language_fi.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Aseta origo"
20 20 
 #define MSG_PREHEAT_PLA                     "Esilammita PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Esilammita PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Esilammita PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Esilammita PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Esilammita PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Esila. PLA Kaikki"
21 
+#define MSG_PREHEAT_PLA_N                   "Esilammita PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Esila. PLA Kaikki"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Esila. PLA Alusta"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Esilamm. PLA konf"
28 25 
 #define MSG_PREHEAT_ABS                     "Esilammita ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Esilammita ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Esilammita ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Esilammita ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Esilammita ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Esila. ABS Kaikki"
26 
+#define MSG_PREHEAT_ABS_N                   "Esilammita ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Esila. ABS Kaikki"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Esila. ABS Alusta"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Esilamm. ABS konf"
36 30 
 #define MSG_COOLDOWN                        "Jaahdyta"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Move Y"
44 38 
 #define MSG_MOVE_Z                          "Move Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Move 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Move 10mm"
51 43 
 #define MSG_SPEED                           "Nopeus"
52 44 
 #define MSG_NOZZLE                          "Suutin"
53 
-#define MSG_NOZZLE1                         "Suutin2"
54 
-#define MSG_NOZZLE2                         "Suutin3"
55 45 
 #define MSG_BED                             "Alusta"
56 46 
 #define MSG_FAN_SPEED                       "Tuul. nopeus"
57 47 
 #define MSG_FLOW                            "Virtaus"
58 
-#define MSG_FLOW0                           "Virtaus 0"
59 
-#define MSG_FLOW1                           "Virtaus 1"
60 
-#define MSG_FLOW2                           "Virtaus 2"
61 48 
 #define MSG_CONTROL                         "Kontrolli"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Kiihtyv"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,8 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
142 121
143 
-#define MSG_RECTRACT                        "Veda takaisin"
144 
-
145 122 
 #ifdef DELTA_CALIBRATION_MENU
146 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
147 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 4
- 28
Marlin/language_fr.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Regler origine"
20 20 
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Prechauff. PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Prechauff. PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Prechauff. PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Prechauff. PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Prech. PLA Tout"
21 
+#define MSG_PREHEAT_PLA_N                   "Prechauff. PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Prech. PLA Tout"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Prech. PLA Plateau"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Regl. prech. PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Prechauffage ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Prechauff. ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Prechauff. ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Prechauff. ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Prechauff. ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Prech. ABS Tout"
26 
+#define MSG_PREHEAT_ABS_N                   "Prechauff. ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Prech. ABS Tout"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Prech. ABS Plateau"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Regl. prech. ABS"
36 30 
 #define MSG_COOLDOWN                        "Refroidir"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Move Y"
44 38 
 #define MSG_MOVE_Z                          "Move Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Move 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Move 10mm"
51 43 
 #define MSG_SPEED                           " Vitesse"
52 44 
 #define MSG_NOZZLE                          "Buse"
53 
-#define MSG_NOZZLE1                         "Buse2"
54 
-#define MSG_NOZZLE2                         "Buse3"
55 45 
 #define MSG_BED                             "Plateau"
56 46 
 #define MSG_FAN_SPEED                       "Vite. ventilateur"
57 47 
 #define MSG_FLOW                            "Flux"
58 
-#define MSG_FLOW0                           "Flux 0"
59 
-#define MSG_FLOW1                           "Flux 1"
60 
-#define MSG_FLOW2                           "Flux 2"
61 48 
 #define MSG_CONTROL                         "Controler"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Accel"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,9 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Butee abandon"
142 121
143 
-#define MSG_RECTRACT                        "Rectract"
144 
-#define MSG_STEPPER_RELEASED                "RELACHE."
145 
-
146 122 
 #ifdef DELTA_CALIBRATION_MENU
147 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
148 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 7
- 37
Marlin/language_it.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
19 19 
 #define MSG_SET_ORIGIN                      "Imposta Origine"
20 20 
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Preriscalda PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Preriscalda PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Preriscalda PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Preriscalda PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Prer. PLA Tutto"
21 
+#define MSG_PREHEAT_PLA_N                   "Preriscalda PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Prer. PLA Tutto"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Prer. PLA Piatto"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Config. prer. PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Preriscalda ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Preriscalda ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Preriscalda ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Preriscalda ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Preriscalda ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Prer. ABS Tutto"
26 
+#define MSG_PREHEAT_ABS_N                   "Preriscalda ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Prer. ABS Tutto"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Prer. ABS Piatto"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Config. prer. ABS"
36 30 
 #define MSG_COOLDOWN                        "Raffredda"
 
@@ -43,28 +37,18 @@
43 37 
 #define MSG_MOVE_Y                          "Muovi Y"
44 38 
 #define MSG_MOVE_Z                          "Muovi Z"
45 39 
 #define MSG_MOVE_E                          "Estrusore"
46 
-#define MSG_MOVE_E1                         "Estrusore 2"
47 
-#define MSG_MOVE_E2                         "Estrusore 3"
48 
-#define MSG_MOVE_E3                         "Estrusore 4"
49 40 
 #define MSG_MOVE_01MM                       "Muovi di 0.1mm"
50 41 
 #define MSG_MOVE_1MM                        "Muovi di   1mm"
51 42 
 #define MSG_MOVE_10MM                       "Muovi di  10mm"
52 43 
 #define MSG_SPEED                           "Velcità"
53 44 
 #define MSG_NOZZLE                          "Ugello"
54 
-#define MSG_NOZZLE1                         "Ugello2"
55 
-#define MSG_NOZZLE2                         "Ugello3"
56 
-#define MSG_NOZZLE3                         "Ugello4"
57 45 
 #define MSG_BED                             "Piatto"
58 46 
 #define MSG_FAN_SPEED                       "Ventola"
59 47 
 #define MSG_FLOW                            "Flusso"
60 
-#define MSG_FLOW0                           "Flusso 0"
61 
-#define MSG_FLOW1                           "Flusso 1"
62 
-#define MSG_FLOW2                           "Flusso 2"
63 
-#define MSG_FLOW3                           "Flusso 3"
64 48 
 #define MSG_CONTROL                         "Controllo"
65 
-#define MSG_MIN                             " \002 Min:"
66 
-#define MSG_MAX                             " \002 Max:"
67 
-#define MSG_FACTOR                          " \002 Fact:"
49 
+#define MSG_MIN                             " \002 Min"
50 
+#define MSG_MAX                             " \002 Max"
51 
+#define MSG_FACTOR                          " \002 Fact"
68 52 
 #define MSG_AUTOTEMP                        "Autotemp"
69 53 
 #define MSG_ON                              "ON "
70 54 
 #define MSG_OFF                             "OFF"
 
@@ -72,18 +56,6 @@
72 56 
 #define MSG_PID_I                           "PID-I"
73 57 
 #define MSG_PID_D                           "PID-D"
74 58 
 #define MSG_PID_C                           "PID-C"
75 
-#define MSG_PID_P1                          "PID-P E2"
76 
-#define MSG_PID_I1                          "PID-I E2"
77 
-#define MSG_PID_D1                          "PID-D E2"
78 
-#define MSG_PID_C1                          "PID-C E2"
79 
-#define MSG_PID_P2                          "PID-P E3"
80 
-#define MSG_PID_I2                          "PID-I E3"
81 
-#define MSG_PID_D2                          "PID-D E3"
82 
-#define MSG_PID_C2                          "PID-C E3"
83 
-#define MSG_PID_P3                          "PID-P E4"
84 
-#define MSG_PID_I3                          "PID-I E4"
85 
-#define MSG_PID_D3                          "PID-D E4"
86 
-#define MSG_PID_C3                          "PID-C E4"
87 59 
 #define MSG_ACC                             "Accel."
88 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
89 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -148,8 +120,6 @@
148 120 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
149 121 
 #define MSG_ENDSTOP_ABORT                   "Finecorsa abort"
150 122
151 
-#define MSG_RECTRACT                        "Ritrai"
152 
-
153 123 
 #ifdef DELTA_CALIBRATION_MENU
154 124 
     #define MSG_DELTA_CALIBRATE             "Calibraz. Delta"
155 125 
     #define MSG_DELTA_CALIBRATE_X           "Calibra X"

+ 4
- 27
Marlin/language_nl.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
20 20 
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
21 
-#define MSG_PREHEAT_PLA0                    "PLA voorverw. 1"
22 
-#define MSG_PREHEAT_PLA1                    "PLA voorverw. 2"
23 
-#define MSG_PREHEAT_PLA2                    "PLA voorverw. 3"
24 
-#define MSG_PREHEAT_PLA3                    "PLA voorverw. 4"
25 
-#define MSG_PREHEAT_PLA0123                 "PLA voorverw. aan"
21 
+#define MSG_PREHEAT_PLA_N                   "PLA voorverw. "
22 
+#define MSG_PREHEAT_PLA_ALL                 "PLA voorverw. aan"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "PLA voorverw. Bed"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "PLA verw. conf"
28 25 
 #define MSG_PREHEAT_ABS                     "ABS voorverwarmen"
29 
-#define MSG_PREHEAT_ABS0                    "ABS voorverw. 1"
30 
-#define MSG_PREHEAT_ABS1                    "ABS voorverw. 2"
31 
-#define MSG_PREHEAT_ABS2                    "ABS voorverw. 3"
32 
-#define MSG_PREHEAT_ABS3                    "ABS voorverw. 4"
33 
-#define MSG_PREHEAT_ABS0123                 "ABS voorverw. aan"
26 
+#define MSG_PREHEAT_ABS_N                   "ABS voorverw. "
27 
+#define MSG_PREHEAT_ABS_ALL                 "ABS voorverw. aan"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "ABS voorverw. Bed"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "ABS verw. conf"
36 30 
 #define MSG_COOLDOWN                        "Afkoelen"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Verplaats Y"
44 38 
 #define MSG_MOVE_Z                          "Verplaats Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Verplaats 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Verplaats 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Verplaats 10mm"
51 43 
 #define MSG_SPEED                           "Snelheid"
52 44 
 #define MSG_NOZZLE                          "Nozzle"
53 
-#define MSG_NOZZLE1                         "Nozzle2"
54 
-#define MSG_NOZZLE2                         "Nozzle3"
55 45 
 #define MSG_BED                             "Bed"
56 46 
 #define MSG_FAN_SPEED                       "Fan snelheid"
57 47 
 #define MSG_FLOW                            "Flow"
58 
-#define MSG_FLOW0                           "Flow 0"
59 
-#define MSG_FLOW1                           "Flow 1"
60 
-#define MSG_FLOW2                           "Flow 2"
61 48 
 #define MSG_CONTROL                         "Control"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Versn"
81 60 
 #define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -140,8 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystap Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop afbr."
142 121
143 
-#define MSG_RECTRACT                        "Terugtrekken"
144 
-
145 122 
 #ifdef DELTA_CALIBRATION_MENU
146 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
147 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 5
- 29
Marlin/language_pl.h 查看文件 

@@ -18,19 +18,13 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
20 20 
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
21 
-#define MSG_PREHEAT_PLA0                    "Rozgrzej PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    "Rozgrzej PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    "Rozgrzej PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    "Rozgrzej PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 "Roz. PLA Wszystko"
21 
+#define MSG_PREHEAT_PLA_N                   "Rozgrzej PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Roz. PLA Wszystko"
26 23 
 #define MSG_PREHEAT_PLA_BEDONLY             "Rozgrzej PLA Loze"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "Ustaw. rozg. PLA"
28 25 
 #define MSG_PREHEAT_ABS                     "Rozgrzej ABS"
29 
-#define MSG_PREHEAT_ABS0                    "Rozgrzej ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    "Rozgrzej ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    "Rozgrzej ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    "Rozgrzej ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 "Roz. ABS Wszystko"
26 
+#define MSG_PREHEAT_ABS_N                   "Rozgrzej ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Roz. ABS Wszystko"
34 28 
 #define MSG_PREHEAT_ABS_BEDONLY             "Rozgrzej ABS Loze"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "Ustaw. rozg. ABS"
36 30 
 #define MSG_COOLDOWN                        "Chlodzenie"
 
@@ -43,21 +37,14 @@
43 37 
 #define MSG_MOVE_Y                          "Przesun w Y"
44 38 
 #define MSG_MOVE_Z                          "Przesun w Z"
45 39 
 #define MSG_MOVE_E                          "Ekstruzja (os E)"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Przesuwaj co .1mm"
49 41 
 #define MSG_MOVE_1MM                        "Przesuwaj co 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Przesuwaj co 10mm"
51 43 
 #define MSG_SPEED                           "Predkosc"
52 44 
 #define MSG_NOZZLE                          "Dysza"
53 
-#define MSG_NOZZLE1                         "Dysza 2"
54 
-#define MSG_NOZZLE2                         "Dysza 3"
55 45 
 #define MSG_BED                             "Loze"
56 46 
 #define MSG_FAN_SPEED                       "Obroty wiatraka"
57 47 
 #define MSG_FLOW                            "Przeplyw"
58 
-#define MSG_FLOW0                           "Przeplyw 0"
59 
-#define MSG_FLOW1                           "Przeplyw 1"
60 
-#define MSG_FLOW2                           "Przeplyw 2"
61 48 
 #define MSG_CONTROL                         "Ustawienia"
62 49 
 #define MSG_MIN                             " \002 Min"
63 50 
 #define MSG_MAX                             " \002 Max"
 
@@ -69,14 +56,6 @@
69 56 
 #define MSG_PID_I                           "PID-I"
70 57 
 #define MSG_PID_D                           "PID-D"
71 58 
 #define MSG_PID_C                           "PID-C"
72 
-#define MSG_PID_P1                          "PID-P E2"
73 
-#define MSG_PID_I1                          "PID-I E2"
74 
-#define MSG_PID_D1                          "PID-D E2"
75 
-#define MSG_PID_C1                          "PID-C E2"
76 
-#define MSG_PID_P2                          "PID-P E3"
77 
-#define MSG_PID_I2                          "PID-I E3"
78 
-#define MSG_PID_D2                          "PID-D E3"
79 
-#define MSG_PID_C2                          "PID-C E3"
80 59 
 #define MSG_ACC                             "Przyspieszenie"
81 60 
 #define MSG_VXY_JERK                        "Zryw Vxy"
82 61 
 #define MSG_VZ_JERK                         "Zryw Vz"
 
@@ -124,7 +103,7 @@
124 103 
 #define MSG_CONTROL_RETRACT                 "Wycofaj mm"
125 104 
 #define MSG_CONTROL_RETRACT_SWAP            "Z Wycof. mm"
126 105 
 #define MSG_CONTROL_RETRACTF                "Wycofaj  V"
127 
-#define MSG_CONTROL_RETRACT_ZLIFT           "Skok Z mm:"
106 
+#define MSG_CONTROL_RETRACT_ZLIFT           "Skok Z mm"
128 107 
 #define MSG_CONTROL_RETRACT_RECOVER         "Cof. wycof. +mm"
129 108 
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Z Cof. wyc. +mm"
130 109 
 #define MSG_CONTROL_RETRACT_RECOVERF        "Cof. wycof.  V"
 
@@ -140,9 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Blad wyl. kranc."
142 121
143 
-#define MSG_RECTRACT                        "Wycofanie"
144 
-#define MSG_STEPPER_RELEASED                "Zwolniony."
145 
-
146 122 
 #ifdef DELTA_CALIBRATION_MENU
147 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
148 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 39
- 67
Marlin/language_pt.h 查看文件 

@@ -18,20 +18,14 @@
18 18 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
19 19 
 #define MSG_SET_ORIGIN                      "Estabelecer orig."
20 20 
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
21 
-#define MSG_PREHEAT_PLA0                    " pre-aquecer PLA 1"
22 
-#define MSG_PREHEAT_PLA1                    " pre-aquecer PLA 2"
23 
-#define MSG_PREHEAT_PLA2                    " pre-aquecer PLA 3"
24 
-#define MSG_PREHEAT_PLA3                    " pre-aquecer PLA 4"
25 
-#define MSG_PREHEAT_PLA0123                 " pre-aq. PLA Tudo"
26 
-#define MSG_PREHEAT_PLA_BEDONLY             " pre-aq. PLA \002Base"
21 
+#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA "
22 
+#define MSG_PREHEAT_PLA_ALL                 "Pre-aq. PLA Tudo"
23 
+#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA \002Base"
27 24 
 #define MSG_PREHEAT_PLA_SETTINGS            "PLA setting"
28 25 
 #define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
29 
-#define MSG_PREHEAT_ABS0                    " pre-aquecer ABS 1"
30 
-#define MSG_PREHEAT_ABS1                    " pre-aquecer ABS 2"
31 
-#define MSG_PREHEAT_ABS2                    " pre-aquecer ABS 3"
32 
-#define MSG_PREHEAT_ABS3                    " pre-aquecer ABS 4"
33 
-#define MSG_PREHEAT_ABS0123                 " pre-aq. ABS Tudo"
34 
-#define MSG_PREHEAT_ABS_BEDONLY             " pre-aq. ABS \002Base"
26 
+#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS "
27 
+#define MSG_PREHEAT_ABS_ALL                 "Pre-aq. ABS Tudo"
28 
+#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS \002Base"
35 29 
 #define MSG_PREHEAT_ABS_SETTINGS            "ABS setting"
36 30 
 #define MSG_COOLDOWN                        "Esfriar"
37 31 
 #define MSG_SWITCH_PS_ON                    "Switch Power On"
 
@@ -43,57 +37,42 @@
43 37 
 #define MSG_MOVE_Y                          "Move Y"
44 38 
 #define MSG_MOVE_Z                          "Move Z"
45 39 
 #define MSG_MOVE_E                          "Extruder"
46 
-#define MSG_MOVE_E1                         "Extruder2"
47 
-#define MSG_MOVE_E2                         "Extruder3"
48 40 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
49 41 
 #define MSG_MOVE_1MM                        "Move 1mm"
50 42 
 #define MSG_MOVE_10MM                       "Move 10mm"
51 
-#define MSG_SPEED                           "Velocidade:"
52 
-#define MSG_NOZZLE                          "\002Nozzle:"
53 
-#define MSG_NOZZLE1                         "\002Nozzle2:"
54 
-#define MSG_NOZZLE2                         "\002Nozzle3:"
55 
-#define MSG_BED                             "\002Base:"
43 
+#define MSG_SPEED                           "Velocidade"
44 
+#define MSG_NOZZLE                          "\002Nozzle"
45 
+#define MSG_BED                             "\002Base"
56 46 
 #define MSG_FAN_SPEED                       "Velocidade vento."
57 
-#define MSG_FLOW                            "Fluxo:"
58 
-#define MSG_FLOW0                           "Fluxo0:"
59 
-#define MSG_FLOW1                           "Fluxo1:"
60 
-#define MSG_FLOW2                           "Fluxo2:"
47 
+#define MSG_FLOW                            "Fluxo"
61 48 
 #define MSG_CONTROL                         "Controle \003"
62 
-#define MSG_MIN                             "\002 Min:"
63 
-#define MSG_MAX                             "\002 Max:"
64 
-#define MSG_FACTOR                          "\002 Fact:"
65 
-#define MSG_AUTOTEMP                        "Autotemp:"
49 
+#define MSG_MIN                             "\002 Min"
50 
+#define MSG_MAX                             "\002 Max"
51 
+#define MSG_FACTOR                          "\002 Fact"
52 
+#define MSG_AUTOTEMP                        "Autotemp"
66 53 
 #define MSG_ON                              "On "
67 54 
 #define MSG_OFF                             "Off"
68 
-#define MSG_PID_P                           "PID-P: "
69 
-#define MSG_PID_I                           "PID-I: "
70 
-#define MSG_PID_D                           "PID-D: "
71 
-#define MSG_PID_C                           "PID-C: "
72 
-#define MSG_PID_P1                          "PID-P E2: "
73 
-#define MSG_PID_I1                          "PID-I E2: "
74 
-#define MSG_PID_D1                          "PID-D E2: "
75 
-#define MSG_PID_C1                          "PID-C E2: "
76 
-#define MSG_PID_P2                          "PID-P E3: "
77 
-#define MSG_PID_I2                          "PID-I E3: "
78 
-#define MSG_PID_D2                          "PID-D E3: "
79 
-#define MSG_PID_C2                          "PID-C E3: "
80 
-#define MSG_ACC                             "Acc:"
81 
-#define MSG_VXY_JERK                        "Vxy-jerk: "
55 
+#define MSG_PID_P                           "PID-P"
56 
+#define MSG_PID_I                           "PID-I"
57 
+#define MSG_PID_D                           "PID-D"
58 
+#define MSG_PID_C                           "PID-C"
59 
+#define MSG_ACC                             "Acc"
60 
+#define MSG_VXY_JERK                        "Vxy-jerk"
82 61 
 #define MSG_VZ_JERK                         "Vz-jerk"
83 62 
 #define MSG_VE_JERK                         "Ve-jerk"
84 63 
 #define MSG_VMAX                            " Vmax "
85 
-#define MSG_X                               "x:"
86 
-#define MSG_Y                               "y:"
87 
-#define MSG_Z                               "z:"
88 
-#define MSG_E                               "e:"
89 
-#define MSG_VMIN                            "Vmin:"
90 
-#define MSG_VTRAV_MIN                       "VTrav min:"
64 
+#define MSG_X                               "x"
65 
+#define MSG_Y                               "y"
66 
+#define MSG_Z                               "z"
67 
+#define MSG_E                               "e"
68 
+#define MSG_VMIN                            "Vmin"
69 
+#define MSG_VTRAV_MIN                       "VTrav min"
91 70 
 #define MSG_AMAX                            "Amax "
92 
-#define MSG_A_RETRACT                       "A-retract:"
93 
-#define MSG_XSTEPS                          "Xpasso/mm:"
94 
-#define MSG_YSTEPS                          "Ypasso/mm:"
95 
-#define MSG_ZSTEPS                          "Zpasso/mm:"
96 
-#define MSG_ESTEPS                          "Epasso/mm:"
71 
+#define MSG_A_RETRACT                       "A-retract"
72 
+#define MSG_XSTEPS                          "Xpasso/mm"
73 
+#define MSG_YSTEPS                          "Ypasso/mm"
74 
+#define MSG_ZSTEPS                          "Zpasso/mm"
75 
+#define MSG_ESTEPS                          "Epasso/mm"
97 76 
 #define MSG_TEMPERATURE                     "Temperatura"
98 77 
 #define MSG_MOTION                          "Movimento"
99 78 
 #define MSG_VOLUMETRIC                      "Filament"
 
@@ -121,14 +100,14 @@
121 100 
 #define MSG_NO_MOVE                         "Sem movimento"
122 101 
 #define MSG_KILLED                          "PARADA DE EMERG."
123 102 
 #define MSG_STOPPED                         "PARADA. "
124 
-#define MSG_CONTROL_RETRACT                 " Retrair mm:"
125 
-#define MSG_CONTROL_RETRACT_SWAP            "Troca Retrair mm:"
126 
-#define MSG_CONTROL_RETRACTF                " Retrair  V:"
127 
-#define MSG_CONTROL_RETRACT_ZLIFT           " Levantar mm:"
128 
-#define MSG_CONTROL_RETRACT_RECOVER         " DesRet +mm:"
129 
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Troca DesRet +mm:"
130 
-#define MSG_CONTROL_RETRACT_RECOVERF        " DesRet  V:"
131 
-#define MSG_AUTORETRACT                     " AutoRetr.:"
103 
+#define MSG_CONTROL_RETRACT                 " Retrair mm"
104 
+#define MSG_CONTROL_RETRACT_SWAP            "Troca Retrair mm"
105 
+#define MSG_CONTROL_RETRACTF                " Retrair  V"
106 
+#define MSG_CONTROL_RETRACT_ZLIFT           " Levantar mm"
107 
+#define MSG_CONTROL_RETRACT_RECOVER         " DesRet +mm"
108 
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Troca DesRet +mm"
109 
+#define MSG_CONTROL_RETRACT_RECOVERF        " DesRet  V"
110 
+#define MSG_AUTORETRACT                     " AutoRetr."
132 111 
 #define MSG_FILAMENTCHANGE                  "Change filament"
133 112 
 #define MSG_INIT_SDCARD                     "Init. SD-Card"
134 113 
 #define MSG_CNG_SDCARD                      "Change SD-Card"
 
@@ -140,13 +119,6 @@
140 119 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
141 120 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
142 121
143 
-#define MSG_RECTRACT                        "Retrair"
144 
-#define MSG_MAIN_WIDE                       "Menu Principal  \003"
145 
-#define MSG_PREPARE_ALT                     "Preparar \003"
146 
-#define MSG_CONTROL_ARROW                   "Controle \x7E"
147 
-#define MSG_RETRACT_ARROW                   "Retrair \x7E"
148 
-#define MSG_STEPPER_RELEASED                "Lancado."
149 
-
150 122 
 #ifdef DELTA_CALIBRATION_MENU
151 123 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
152 124 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 38
- 61
Marlin/language_ru.h 查看文件 

@@ -20,19 +20,13 @@
20 20 
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
21 21 
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
22 22 
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"
23 
-#define MSG_PREHEAT_PLA0                    "Преднагрев PLA1"
24 
-#define MSG_PREHEAT_PLA1                    "Преднагрев PLA2"
25 
-#define MSG_PREHEAT_PLA2                    "Преднагрев PLA3"
26 
-#define MSG_PREHEAT_PLA3                    "Преднагрев PLA4"
27 
-#define MSG_PREHEAT_PLA0123                 "Преднаг. PLA все"
23 
+#define MSG_PREHEAT_PLA_N                   "Преднагрев PLA"
24 
+#define MSG_PREHEAT_PLA_ALL                 "Преднаг. PLA все"
28 25 
 #define MSG_PREHEAT_PLA_BEDONLY             "Пред. PLA Кровать"
29 26 
 #define MSG_PREHEAT_PLA_SETTINGS            "Настройки PLA"
30 27 
 #define MSG_PREHEAT_ABS                     "Преднагрев ABS"
31 
-#define MSG_PREHEAT_ABS0                    "Преднагрев ABS1"
32 
-#define MSG_PREHEAT_ABS1                    "Преднагрев ABS2"
33 
-#define MSG_PREHEAT_ABS2                    "Преднагрев ABS3"
34 
-#define MSG_PREHEAT_ABS3                    "Преднагрев ABS4"
35 
-#define MSG_PREHEAT_ABS0123                 "Преднаг. ABS все "
28 
+#define MSG_PREHEAT_ABS_N                   "Преднагрев ABS"
29 
+#define MSG_PREHEAT_ABS_ALL                 "Преднаг. ABS все "
36 30 
 #define MSG_PREHEAT_ABS_BEDONLY             "Пред. ABS Кровать"
37 31 
 #define MSG_PREHEAT_ABS_SETTINGS            "Настройки ABS"
38 32 
 #define MSG_COOLDOWN                        "Охлаждение"
 
@@ -45,57 +39,42 @@
45 39 
 #define MSG_MOVE_Y                          "Move Y"
46 40 
 #define MSG_MOVE_Z                          "Move Z"
47 41 
 #define MSG_MOVE_E                          "Extruder"
48 
-#define MSG_MOVE_E1                         "Extruder2"
49 
-#define MSG_MOVE_E2                         "Extruder3"
50 42 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
51 43 
 #define MSG_MOVE_1MM                        "Move 1mm"
52 44 
 #define MSG_MOVE_10MM                       "Move 10mm"
53 
-#define MSG_SPEED                           "Скорость:"
54 
-#define MSG_NOZZLE                          "\002 Фильера:"
55 
-#define MSG_NOZZLE1                         "\002 Фильера2:"
56 
-#define MSG_NOZZLE2                         "\002 Фильера3:"
57 
-#define MSG_BED                             "\002 Кровать:"
58 
-#define MSG_FAN_SPEED                       "Куллер:"
59 
-#define MSG_FLOW                            "Поток:"
60 
-#define MSG_FLOW0                           " Поток0:"
61 
-#define MSG_FLOW1                           " Поток1:"
62 
-#define MSG_FLOW2                           " Поток2:"
45 
+#define MSG_SPEED                           "Скорость"
46 
+#define MSG_NOZZLE                          "\002 Фильера"
47 
+#define MSG_BED                             "\002 Кровать"
48 
+#define MSG_FAN_SPEED                       "Куллер"
49 
+#define MSG_FLOW                            "Поток"
63 50 
 #define MSG_CONTROL                         "Настройки \003"
64 
-#define MSG_MIN                             "\002 Минимум:"
65 
-#define MSG_MAX                             "\002 Максимум:"
66 
-#define MSG_FACTOR                          "\002 Фактор:"
67 
-#define MSG_AUTOTEMP                        "Autotemp:"
51 
+#define MSG_MIN                             "\002 Минимум"
52 
+#define MSG_MAX                             "\002 Максимум"
53 
+#define MSG_FACTOR                          "\002 Фактор"
54 
+#define MSG_AUTOTEMP                        "Autotemp"
68 55 
 #define MSG_ON                              "Вкл. "
69 56 
 #define MSG_OFF                             "Выкл. "
70 
-#define MSG_PID_P                           "PID-P: "
71 
-#define MSG_PID_I                           "PID-I: "
72 
-#define MSG_PID_D                           "PID-D: "
73 
-#define MSG_PID_C                           "PID-C: "
74 
-#define MSG_PID_P1                          "PID-P E2: "
75 
-#define MSG_PID_I1                          "PID-I E2: "
76 
-#define MSG_PID_D1                          "PID-D E2: "
77 
-#define MSG_PID_C1                          "PID-C E2: "
78 
-#define MSG_PID_P2                          "PID-P E3: "
79 
-#define MSG_PID_I2                          "PID-I E3: "
80 
-#define MSG_PID_D2                          "PID-D E3: "
81 
-#define MSG_PID_C2                          "PID-C E3: "
82 
-#define MSG_ACC                             "Acc:"
83 
-#define MSG_VXY_JERK                        "Vxy-jerk: "
57 
+#define MSG_PID_P                           "PID-P"
58 
+#define MSG_PID_I                           "PID-I"
59 
+#define MSG_PID_D                           "PID-D"
60 
+#define MSG_PID_C                           "PID-C"
61 
+#define MSG_ACC                             "Acc"
62 
+#define MSG_VXY_JERK                        "Vxy-jerk"
84 63 
 #define MSG_VZ_JERK                         "Vz-jerk"
85 64 
 #define MSG_VE_JERK                         "Ve-jerk"
86 65 
 #define MSG_VMAX                            "Vmax "
87 
-#define MSG_X                               "x:"
88 
-#define MSG_Y                               "y:"
89 
-#define MSG_Z                               "z:"
90 
-#define MSG_E                               "e:"
91 
-#define MSG_VMIN                            "Vmin:"
92 
-#define MSG_VTRAV_MIN                       "VTrav min:"
66 
+#define MSG_X                               "x"
67 
+#define MSG_Y                               "y"
68 
+#define MSG_Z                               "z"
69 
+#define MSG_E                               "e"
70 
+#define MSG_VMIN                            "Vmin"
71 
+#define MSG_VTRAV_MIN                       "VTrav min"
93 72 
 #define MSG_AMAX                            "Amax "
94 
-#define MSG_A_RETRACT                       "A-retract:"
95 
-#define MSG_XSTEPS                          "X шаг/mm:"
96 
-#define MSG_YSTEPS                          "Y шаг/mm:"
97 
-#define MSG_ZSTEPS                          "Z шаг/mm:"
98 
-#define MSG_ESTEPS                          "E шаг/mm:"
73 
+#define MSG_A_RETRACT                       "A-retract"
74 
+#define MSG_XSTEPS                          "X шаг/mm"
75 
+#define MSG_YSTEPS                          "Y шаг/mm"
76 
+#define MSG_ZSTEPS                          "Z шаг/mm"
77 
+#define MSG_ESTEPS                          "E шаг/mm"
99 78 
 #define MSG_TEMPERATURE                     "Температура     \x7E"
100 79 
 #define MSG_MOTION                          "Скорости        \x7E"
101 80 
 #define MSG_VOLUMETRIC                      "Filament"
 
@@ -123,14 +102,14 @@
123 102 
 #define MSG_NO_MOVE                         "Нет движения."
124 103 
 #define MSG_KILLED                          "УБИТО."
125 104 
 #define MSG_STOPPED                         "ОСТАНОВЛЕНО."
126 
-#define MSG_CONTROL_RETRACT                 "Откат mm:"
127 
-#define MSG_CONTROL_RETRACT_SWAP            "своп Откат mm:"
128 
-#define MSG_CONTROL_RETRACTF                "Откат  V:"
129 
-#define MSG_CONTROL_RETRACT_ZLIFT           "Прыжок mm:"
130 
-#define MSG_CONTROL_RETRACT_RECOVER         "Возврат +mm:"
131 
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "своп Возврат +mm:"
132 
-#define MSG_CONTROL_RETRACT_RECOVERF        "Возврат  V:"
133 
-#define MSG_AUTORETRACT                     "АвтоОткат:"
105 
+#define MSG_CONTROL_RETRACT                 "Откат mm"
106 
+#define MSG_CONTROL_RETRACT_SWAP            "своп Откат mm"
107 
+#define MSG_CONTROL_RETRACTF                "Откат  V"
108 
+#define MSG_CONTROL_RETRACT_ZLIFT           "Прыжок mm"
109 
+#define MSG_CONTROL_RETRACT_RECOVER         "Возврат +mm"
110 
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "своп Возврат +mm"
111 
+#define MSG_CONTROL_RETRACT_RECOVERF        "Возврат  V"
112 
+#define MSG_AUTORETRACT                     "АвтоОткат"
134 113 
 #define MSG_FILAMENTCHANGE                  "Change filament"
135 114 
 #define MSG_INIT_SDCARD                     "Init. SD-Card"
136 115 
 #define MSG_CNG_SDCARD                      "Change SD-Card"
 
@@ -142,8 +121,6 @@
142 121 
 #define MSG_BABYSTEP_Z                      "Babystep Z"
143 122 
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
144 123
145 
-#define MSG_RECTRACT                        "Откат подачи    \x7E"
146 
-
147 124 
 #ifdef DELTA_CALIBRATION_MENU
148 125 
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
149 126 
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

+ 25
- 25
Marlin/ultralcd.cpp 查看文件 

@@ -426,13 +426,13 @@ static void lcd_tune_menu()
426 426 
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
427 427 
 #endif
428 428 
 #if TEMP_SENSOR_1 != 0
429 
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
429 
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
430 430 
 #endif
431 431 
 #if TEMP_SENSOR_2 != 0
432 
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE2, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
432 
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
433 433 
 #endif
434 434 
 #if TEMP_SENSOR_3 != 0
435 
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE3, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
435 
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 4", &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
436 436 
 #endif
437 437
438 438 
 
@@ -441,15 +441,15 @@ static void lcd_tune_menu()
441 441 
 #endif
442 442 
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
443 443 
     MENU_ITEM_EDIT(int3, MSG_FLOW, &extrudemultiply, 10, 999);
444 
-    MENU_ITEM_EDIT(int3, MSG_FLOW0, &extruder_multiply[0], 10, 999);
444 
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 0", &extruder_multiply[0], 10, 999);
445 445 
 #if TEMP_SENSOR_1 != 0
446 
-    MENU_ITEM_EDIT(int3, MSG_FLOW1, &extruder_multiply[1], 10, 999);
446 
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 1", &extruder_multiply[1], 10, 999);
447 447 
 #endif
448 448 
 #if TEMP_SENSOR_2 != 0
449 
-    MENU_ITEM_EDIT(int3, MSG_FLOW2, &extruder_multiply[2], 10, 999);
449 
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 2", &extruder_multiply[2], 10, 999);
450 450 
 #endif
451 451 
 #if TEMP_SENSOR_3 != 0
452 
-    MENU_ITEM_EDIT(int3, MSG_FLOW3, &extruder_multiply[3], 10, 999);
452 
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 3", &extruder_multiply[3], 10, 999);
453 453 
 #endif
454 454
455 455 
 
@@ -591,18 +591,18 @@ static void lcd_preheat_pla_menu()
591 591 
 {
592 592 
   START_MENU();
593 593 
   MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
594 
-  MENU_ITEM(function, MSG_PREHEAT_PLA0, lcd_preheat_pla0);
594 
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "1", lcd_preheat_pla0);
595 595 
 #if TEMP_SENSOR_1 != 0 //2 extruder preheat
596 
-  MENU_ITEM(function, MSG_PREHEAT_PLA1, lcd_preheat_pla1);
596 
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "2", lcd_preheat_pla1);
597 597 
 #endif //2 extruder preheat
598 598 
 #if TEMP_SENSOR_2 != 0 //3 extruder preheat
599 
-  MENU_ITEM(function, MSG_PREHEAT_PLA2, lcd_preheat_pla2);
599 
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "3", lcd_preheat_pla2);
600 600 
 #endif //3 extruder preheat
601 601 
 #if TEMP_SENSOR_3 != 0 //4 extruder preheat
602 
-  MENU_ITEM(function, MSG_PREHEAT_PLA3, lcd_preheat_pla3);
602 
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "4", lcd_preheat_pla3);
603 603 
 #endif //4 extruder preheat
604 604 
 #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 //all extruder preheat
605 
-  MENU_ITEM(function, MSG_PREHEAT_PLA0123, lcd_preheat_pla0123);
605 
+  MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
606 606 
 #endif //all extruder preheat
607 607 
 #if TEMP_SENSOR_BED != 0
608 608 
   MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
 
@@ -614,18 +614,18 @@ static void lcd_preheat_abs_menu()
614 614 
 {
615 615 
   START_MENU();
616 616 
   MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
617 
-  MENU_ITEM(function, MSG_PREHEAT_ABS0, lcd_preheat_abs0);
617 
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "1", lcd_preheat_abs0);
618 618 
 #if TEMP_SENSOR_1 != 0 //2 extruder preheat
619 
-	MENU_ITEM(function, MSG_PREHEAT_ABS1, lcd_preheat_abs1);
619 
+	MENU_ITEM(function, MSG_PREHEAT_ABS_N "2", lcd_preheat_abs1);
620 620 
 #endif //2 extruder preheat
621 621 
 #if TEMP_SENSOR_2 != 0 //3 extruder preheat
622 
-  MENU_ITEM(function, MSG_PREHEAT_ABS2, lcd_preheat_abs2);
622 
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "3", lcd_preheat_abs2);
623 623 
 #endif //3 extruder preheat
624 624 
 #if TEMP_SENSOR_3 != 0 //4 extruder preheat
625 
-  MENU_ITEM(function, MSG_PREHEAT_ABS3, lcd_preheat_abs3);
625 
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "4", lcd_preheat_abs3);
626 626 
 #endif //4 extruder preheat
627 627 
 #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 //all extruder preheat
628 
-  MENU_ITEM(function, MSG_PREHEAT_ABS0123, lcd_preheat_abs0123);
628 
+  MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
629 629 
 #endif //all extruder preheat
630 630
631 631 
 #if TEMP_SENSOR_BED != 0
 
@@ -848,12 +848,12 @@ static void lcd_control_temperature_menu()
848 848 
 	  pid_current_extruder = 0;
849 849 
 	  raw_Ki = unscalePID_i(PID_PARAM(Ki,1));
850 850 
 	  raw_Kd = unscalePID_d(PID_PARAM(Kd,1));
851 
-	  MENU_ITEM_EDIT(float52, MSG_PID_P1, &PID_PARAM(Kp,1), 1, 9990);
851 
+	  MENU_ITEM_EDIT(float52, MSG_PID_P " E2", &PID_PARAM(Kp,1), 1, 9990);
852 852 
 	  // i is typically a small value so allows values below 1
853 
-	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I1, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
854 
-	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D1, &raw_Kd, 1, 9990, copy_and_scalePID_d);
853 
+	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E2", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
854 
+	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E2", &raw_Kd, 1, 9990, copy_and_scalePID_d);
855 855 
       #ifdef PID_ADD_EXTRUSION_RATE
856 
-	    MENU_ITEM_EDIT(float3, MSG_PID_C1, &PID_PARAM(Kc,1), 1, 9990);
856 
+	    MENU_ITEM_EDIT(float3, MSG_PID_C " E2", &PID_PARAM(Kc,1), 1, 9990);
857 857 
       #endif//PID_ADD_EXTRUSION_RATE
858 858 
   #endif//EXTRUDERS > 1
859 859 
   #if EXTRUDERS > 2
 
@@ -861,12 +861,12 @@ static void lcd_control_temperature_menu()
861 861 
 	    pid_current_extruder = 0;
862 862 
 	    raw_Ki = unscalePID_i(PID_PARAM(Ki,2));
863 863 
 	    raw_Kd = unscalePID_d(PID_PARAM(Kd,2));
864 
-	    MENU_ITEM_EDIT(float52, MSG_PID_P2, &PID_PARAM(Kp,2), 1, 9990);
864 
+	    MENU_ITEM_EDIT(float52, MSG_PID_P " E3", &PID_PARAM(Kp,2), 1, 9990);
865 865 
 	    // i is typically a small value so allows values below 1
866 
-	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I2, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
867 
-	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D2, &raw_Kd, 1, 9990, copy_and_scalePID_d);
866 
+	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E3", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
867 
+	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E3", &raw_Kd, 1, 9990, copy_and_scalePID_d);
868 868 
         #ifdef PID_ADD_EXTRUSION_RATE
869 
-	      MENU_ITEM_EDIT(float3, MSG_PID_C2, &PID_PARAM(Kc,2), 1, 9990);
869 
+	      MENU_ITEM_EDIT(float3, MSG_PID_C " E3", &PID_PARAM(Kc,2), 1, 9990);
870 870 
         #endif//PID_ADD_EXTRUSION_RATE
871 871 
   #endif//EXTRUDERS > 2
872 872 
 #endif // PID_PARAMS_PER_EXTRUDER

撰写 预览
正在加载...
取消
保存