Merge pull request #1427 from thinkyhead/fewer_preheat_strings

Remove language strings that only add a number

Marlin/language.h

@@ -11,19 +11,20 @@
 //   ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
 
 // Languages
-// en English
-// pl Polish
-// fr French
-// de German
-// es Spanish
-// ru Russian
-// it Italian
-// pt Portuguese
-// fi Finnish
-// an Aragonese
-// nl Dutch
-// ca Catalan
-// eu Basque-Euskera
+// en    English
+// pl    Polish
+// fr    French
+// de    German
+// es    Spanish
+// ru    Russian
+// it    Italian
+// pt    Portuguese
+// pt-br Portuguese (Brazil)
+// fi    Finnish
+// an    Aragonese
+// nl    Dutch
+// ca    Catalan
+// eu    Basque-Euskera
 
 #ifndef LANGUAGE_INCLUDE
   // pick your language from the list above

Marlin/language_an.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Establir zero"
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
-#define MSG_PREHEAT_PLA0                    "Precalentar PLA1"
-#define MSG_PREHEAT_PLA1                    "Precalentar PLA2"
-#define MSG_PREHEAT_PLA2                    "Precalentar PLA3"
-#define MSG_PREHEAT_PLA3                    "Precalentar PLA4"
-#define MSG_PREHEAT_PLA0123                 "Precalentar PLA a"
+#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Precalentar PLA a"
 #define MSG_PREHEAT_PLA_BEDONLY             "Prec. PLA Base"
 #define MSG_PREHEAT_PLA_SETTINGS            "Achustar tem. PLA"
 #define MSG_PREHEAT_ABS                     "Precalentar ABS"
-#define MSG_PREHEAT_ABS0                    "Precalentar ABS1"
-#define MSG_PREHEAT_ABS1                    "Precalentar ABS2"
-#define MSG_PREHEAT_ABS2                    "Precalentar ABS3"
-#define MSG_PREHEAT_ABS3                    "Precalentar ABS4"
-#define MSG_PREHEAT_ABS0123                 "Precalentar ABS a"
+#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Precalentar ABS a"
 #define MSG_PREHEAT_ABS_BEDONLY             "Prec. ABS Base"
 #define MSG_PREHEAT_ABS_SETTINGS            "Achustar tem. ABS"
 #define MSG_COOLDOWN                        "Enfriar"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Move Y"
 #define MSG_MOVE_Z                          "Move Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
 #define MSG_SPEED                           "Velocidat"
 #define MSG_NOZZLE                          "Nozzle"
-#define MSG_NOZZLE1                         "Nozzle2"
-#define MSG_NOZZLE2                         "Nozzle3"
 #define MSG_BED                             "Base"
 #define MSG_FAN_SPEED                       "Ixoriador"
 #define MSG_FLOW                            "Fluxo"
-#define MSG_FLOW0                           "Fluxo 0"
-#define MSG_FLOW1                           "Fluxo 1"
-#define MSG_FLOW2                           "Fluxo 2"
 #define MSG_CONTROL                         "Control"
 #define MSG_MIN                             "\002 Min"
 #define MSG_MAX                             "\002 Max"
@@ -132,17 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Retraer"
-#define MSG_RECTRACT_WIDE                   "Retraer"
-#define MSG_TEMPERATURE_WIDE                "Temperatura"
-#define MSG_TEMPERATURE_RTN                 "Temperatura"
-#define MSG_MAIN_WIDE                       "Menu Prencipal"
-#define MSG_MOTION_WIDE                     "Movimiento"
-#define MSG_PREPARE_ALT                     "Preparar"
-#define MSG_CONTROL_ARROW                   "Control \x7E"
-#define MSG_RETRACT_ARROW                   "Retraer \x7E"
-#define MSG_STEPPER_RELEASED                "Desacoplada."
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_ca.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Establir origen"
 #define MSG_PREHEAT_PLA                     "Preescalfar PLA"
-#define MSG_PREHEAT_PLA0                    "Preescalfar PLA 1"
-#define MSG_PREHEAT_PLA1                    "Preescalfar PLA 2"
-#define MSG_PREHEAT_PLA2                    "Preescalfar PLA 3"
-#define MSG_PREHEAT_PLA3                    "Preescalfar PLA 4" 
-#define MSG_PREHEAT_PLA0123                 "Preesc. tot PLA"
+#define MSG_PREHEAT_PLA_N                   "Preescalfar PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Preesc. tot PLA"
 #define MSG_PREHEAT_PLA_BEDONLY             "Preesc. llit PLA"
 #define MSG_PREHEAT_PLA_SETTINGS            "Configuració PLA"
 #define MSG_PREHEAT_ABS                     "Preescalfar ABS"
-#define MSG_PREHEAT_ABS0                    "Preescalfar ABS 1"
-#define MSG_PREHEAT_ABS1                    "Preescalfar ABS 2"
-#define MSG_PREHEAT_ABS2                    "Preescalfar ABS 3"
-#define MSG_PREHEAT_ABS3                    "Preescalfar ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Preesc. tot ABS"
+#define MSG_PREHEAT_ABS_N                   "Preescalfar ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Preesc. tot ABS"
 #define MSG_PREHEAT_ABS_BEDONLY             "Preesc. llit ABS"
 #define MSG_PREHEAT_ABS_SETTINGS            "Configuració ABS"
 #define MSG_COOLDOWN                        "Refredar"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Moure Y"
 #define MSG_MOVE_Z                          "Moure Z"
 #define MSG_MOVE_E                          "Extrusor"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Moure 0.1mm"
 #define MSG_MOVE_1MM                        "Moure 1mm"
 #define MSG_MOVE_10MM                       "Moure 10mm"
 #define MSG_SPEED                           "Velocitat"
 #define MSG_NOZZLE                          "Nozzle"
-#define MSG_NOZZLE1                         "Nozzle2"
-#define MSG_NOZZLE2                         "Nozzle3"
 #define MSG_BED                             "Llit"
 #define MSG_FAN_SPEED                       "Vel. Ventilador"
 #define MSG_FLOW                            "Fluxe"
-#define MSG_FLOW0                           "Fluxe 0"
-#define MSG_FLOW1                           "Fluxe 1"
-#define MSG_FLOW2                           "Fluxe 2"
 #define MSG_CONTROL                         "Control"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Accel"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,8 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Retreure"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_de.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Setze Nullpunkt"
 #define MSG_PREHEAT_PLA                     "Vorwärmen PLA"
-#define MSG_PREHEAT_PLA0                    "Vorwärmen PLA 1"
-#define MSG_PREHEAT_PLA1                    "Vorwärmen PLA 2"
-#define MSG_PREHEAT_PLA2                    "Vorwärmen PLA 3"
-#define MSG_PREHEAT_PLA3                    "Vorwärmen PLA 4" 
-#define MSG_PREHEAT_PLA0123                 "Vorw. PLA Alle"
+#define MSG_PREHEAT_PLA_N                   "Vorwärmen PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Vorw. PLA Alle"
 #define MSG_PREHEAT_PLA_BEDONLY             "Vorw. PLA Bett"
 #define MSG_PREHEAT_PLA_SETTINGS            "Vorwärm. PLA Ein."
 #define MSG_PREHEAT_ABS                     "Vorwärmen ABS"
-#define MSG_PREHEAT_ABS0                    "Vorwärmen ABS 1"
-#define MSG_PREHEAT_ABS1                    "Vorwärmen ABS 2"
-#define MSG_PREHEAT_ABS2                    "Vorwärmen ABS 3"
-#define MSG_PREHEAT_ABS3                    "Vorwärmen ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Vorw. ABS Alle"
+#define MSG_PREHEAT_ABS_N                   "Vorwärmen ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Vorw. ABS Alle"
 #define MSG_PREHEAT_ABS_BEDONLY             "Vorw. ABS Bett"
 #define MSG_PREHEAT_ABS_SETTINGS            "Vorwärm. ABS Ein."
 #define MSG_COOLDOWN                        "Abkühlen"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Y bewegen"
 #define MSG_MOVE_Z                          "Z bewegen"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "0.1mm bewegen"
 #define MSG_MOVE_1MM                        "1mm bewegen"
 #define MSG_MOVE_10MM                       "10mm bewegen"
 #define MSG_SPEED                           "Geschw"
 #define MSG_NOZZLE                          "Düse"
-#define MSG_NOZZLE1                         "Düse2"
-#define MSG_NOZZLE2                         "Düse3"
 #define MSG_BED                             "Bett"
 #define MSG_FAN_SPEED                       "Lüftergeschw."
 #define MSG_FLOW                            "Fluss"
-#define MSG_FLOW0                           "Fluss 0"
-#define MSG_FLOW1                           "Fluss 1"
-#define MSG_FLOW2                           "Fluss 2"
 #define MSG_CONTROL                         "Einstellungen"
 #define MSG_MIN                             "\002 Min"
 #define MSG_MAX                             "\002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Acc"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,9 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_STEPPER_RELEASED                "Stepper frei"
-#define MSG_RECTRACT_WIDE                   "Rectract"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_en.h

@@ -18,21 +18,15 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Set origin"
 #define MSG_PREHEAT_PLA                     "Preheat PLA"
-#define MSG_PREHEAT_PLA0                    "Preheat PLA 1"
-#define MSG_PREHEAT_PLA1                    "Preheat PLA 2"
-#define MSG_PREHEAT_PLA2                    "Preheat PLA 3"
-#define MSG_PREHEAT_PLA3                    "Preheat PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Preheat PLA All"
-#define MSG_PREHEAT_PLA_BEDONLY             "Preheat PLA Bed"
-#define MSG_PREHEAT_PLA_SETTINGS            "Preheat PLA conf"
+#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
+#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " All"
+#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " Bed"
+#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " conf"
 #define MSG_PREHEAT_ABS                     "Preheat ABS"
-#define MSG_PREHEAT_ABS0                    "Preheat ABS 1"
-#define MSG_PREHEAT_ABS1                    "Preheat ABS 2"
-#define MSG_PREHEAT_ABS2                    "Preheat ABS 3"
-#define MSG_PREHEAT_ABS3                    "Preheat ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Preheat ABS All"
-#define MSG_PREHEAT_ABS_BEDONLY             "Preheat ABS Bed"
-#define MSG_PREHEAT_ABS_SETTINGS            "Preheat ABS conf"
+#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
+#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " All"
+#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Bed"
+#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
 #define MSG_COOLDOWN                        "Cooldown"
 #define MSG_SWITCH_PS_ON                    "Switch power on"
 #define MSG_SWITCH_PS_OFF                   "Switch power off"
@@ -43,24 +37,14 @@
 #define MSG_MOVE_Y                          "Move Y"
 #define MSG_MOVE_Z                          "Move Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
-#define MSG_MOVE_E3                         "Extruder4"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
 #define MSG_SPEED                           "Speed"
 #define MSG_NOZZLE                          "Nozzle"
-#define MSG_NOZZLE1                         "Nozzle2"
-#define MSG_NOZZLE2                         "Nozzle3"
-#define MSG_NOZZLE3                         "Nozzle4"
 #define MSG_BED                             "Bed"
 #define MSG_FAN_SPEED                       "Fan speed"
 #define MSG_FLOW                            "Flow"
-#define MSG_FLOW0                           "Flow 0"
-#define MSG_FLOW1                           "Flow 1"
-#define MSG_FLOW2                           "Flow 2"
-#define MSG_FLOW3                           "Flow 3"
 #define MSG_CONTROL                         "Control"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -72,18 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
-#define MSG_PID_P3                          "PID-P E4"
-#define MSG_PID_I3                          "PID-I E4"
-#define MSG_PID_D3                          "PID-D E4"
-#define MSG_PID_C3                          "PID-C E4"
 #define MSG_ACC                             "Accel"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -148,8 +120,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Rectract"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_es.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Ajustar offsets"
 #define MSG_SET_ORIGIN                      "Establecer cero"
 #define MSG_PREHEAT_PLA                     "Precalentar PLA"
-#define MSG_PREHEAT_PLA0                    "Precalentar PLA 1"
-#define MSG_PREHEAT_PLA1                    "Precalentar PLA 2"
-#define MSG_PREHEAT_PLA2                    "Precalentar PLA 3"
-#define MSG_PREHEAT_PLA3                    "Precalentar PLA 4" 
-#define MSG_PREHEAT_PLA0123                 "Precal. PLA Todo"
+#define MSG_PREHEAT_PLA_N                   "Precalentar PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Precal. PLA Todo"
 #define MSG_PREHEAT_PLA_BEDONLY             "Precal. PLA Base"
 #define MSG_PREHEAT_PLA_SETTINGS            "Ajustar temp. PLA"
 #define MSG_PREHEAT_ABS                     "Precalentar ABS"
-#define MSG_PREHEAT_ABS0                    "Precalentar ABS 1"
-#define MSG_PREHEAT_ABS1                    "Precalentar ABS 2"
-#define MSG_PREHEAT_ABS2                    "Precalentar ABS 3"
-#define MSG_PREHEAT_ABS3                    "Precalentar ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Precal. ABS Todo"
+#define MSG_PREHEAT_ABS_N                   "Precalentar ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Precal. ABS Todo"
 #define MSG_PREHEAT_ABS_BEDONLY             "Precal. ABS Base"
 #define MSG_PREHEAT_ABS_SETTINGS            "Ajustar temp. ABS"
 #define MSG_COOLDOWN                        "Enfriar"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Mover Y"
 #define MSG_MOVE_Z                          "Mover Z"
 #define MSG_MOVE_E                          "Extrusor"
-#define MSG_MOVE_E1                         "Extrusor2"
-#define MSG_MOVE_E2                         "Extrusor3"
 #define MSG_MOVE_01MM                       "Mover 0.1mm"
 #define MSG_MOVE_1MM                        "Mover 1mm"
 #define MSG_MOVE_10MM                       "Mover 10mm"
 #define MSG_SPEED                           "Velocidad"
 #define MSG_NOZZLE                          "Nozzle"
-#define MSG_NOZZLE1                         "Nozzle2"
-#define MSG_NOZZLE2                         "Nozzle3"
 #define MSG_BED                             "Base"
 #define MSG_FAN_SPEED                       "Ventilador"
 #define MSG_FLOW                            "Flujo"
-#define MSG_FLOW0                           "Flujo 0"
-#define MSG_FLOW1                           "Flujo 1"
-#define MSG_FLOW2                           "Flujo 2"
 #define MSG_CONTROL                         "Control"
 #define MSG_MIN                             "\002 Min"
 #define MSG_MAX                             "\002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Acel"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,17 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Retraer"
-#define MSG_RECTRACT_WIDE                   "Retraer"
-#define MSG_TEMPERATURE_WIDE                "Temperatura"
-#define MSG_TEMPERATURE_RTN                 "Temperatura"
-#define MSG_MAIN_WIDE                       "Menu principal"
-#define MSG_MOTION_WIDE                     "Movimiento"
-#define MSG_PREPARE_ALT                     "Preparar"
-#define MSG_CONTROL_ARROW                   "Control \x7E"
-#define MSG_RETRACT_ARROW                   "Retraer \x7E"
-#define MSG_STEPPER_RELEASED                "Desacoplada."
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_eu.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Hasiera ipini"
 #define MSG_PREHEAT_PLA                     "Aurreberotu PLA"
-#define MSG_PREHEAT_PLA0                    "Aurreberotu PLA1"
-#define MSG_PREHEAT_PLA1                    "Aurreberotu PLA2"
-#define MSG_PREHEAT_PLA2                    "Aurreberotu PLA3"
-#define MSG_PREHEAT_PLA3                    "Aurreberotu PLA4"
-#define MSG_PREHEAT_PLA0123                 "Berotu PLA Guztia"
+#define MSG_PREHEAT_PLA_N                   "Aurreberotu PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Berotu PLA Guztia"
 #define MSG_PREHEAT_PLA_BEDONLY             "Berotu PLA Ohea"
 #define MSG_PREHEAT_PLA_SETTINGS            "Berotu PLA Konfig"
 #define MSG_PREHEAT_ABS                     "Aurreberotu ABS"
-#define MSG_PREHEAT_ABS0                    "Aurreberotu ABS 1"
-#define MSG_PREHEAT_ABS1                    "Aurreberotu ABS 2"
-#define MSG_PREHEAT_ABS2                    "Aurreberotu ABS 3"
-#define MSG_PREHEAT_ABS3                    "Aurreberotu ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Berotu ABS Guztia"
+#define MSG_PREHEAT_ABS_N                   "Aurreberotu ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Berotu ABS Guztia"
 #define MSG_PREHEAT_ABS_BEDONLY             "Berotu ABS Ohea"
 #define MSG_PREHEAT_ABS_SETTINGS            "Berotu ABS Konfig"
 #define MSG_COOLDOWN                        "Hoztu"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Mugitu Y"
 #define MSG_MOVE_Z                          "Mugitu Z"
 #define MSG_MOVE_E                          "Estrusorea"
-#define MSG_MOVE_E1                         "Estrusorea2"
-#define MSG_MOVE_E2                         "Estrusorea3"
 #define MSG_MOVE_01MM                       "Mugitu 0.1mm"
 #define MSG_MOVE_1MM                        "Mugitu 1mm"
 #define MSG_MOVE_10MM                       "Mugitu 10mm"
 #define MSG_SPEED                           "Abiadura"
 #define MSG_NOZZLE                          "Pita"
-#define MSG_NOZZLE1                         "Pita2"
-#define MSG_NOZZLE2                         "Pita3"
 #define MSG_BED                             "Ohea"
 #define MSG_FAN_SPEED                       "Haizagailua"
 #define MSG_FLOW                            "Fluxua"
-#define MSG_FLOW0                           "Fluxua 0"
-#define MSG_FLOW1                           "Fluxua 1"
-#define MSG_FLOW2                           "Fluxua 2"
 #define MSG_CONTROL                         "Kontrola"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Azelerazioa"
 #define MSG_VXY_JERK                        "Vxy-astindua"
 #define MSG_VZ_JERK                         "Vz-astindua"
@@ -140,8 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop deuseztat"
 
-#define MSG_RECTRACT                        "Atzera eragin"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_fi.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Aseta origo"
 #define MSG_PREHEAT_PLA                     "Esilammita PLA"
-#define MSG_PREHEAT_PLA0                    "Esilammita PLA 1"
-#define MSG_PREHEAT_PLA1                    "Esilammita PLA 2"
-#define MSG_PREHEAT_PLA2                    "Esilammita PLA 3"
-#define MSG_PREHEAT_PLA3                    "Esilammita PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Esila. PLA Kaikki"
+#define MSG_PREHEAT_PLA_N                   "Esilammita PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Esila. PLA Kaikki"
 #define MSG_PREHEAT_PLA_BEDONLY             "Esila. PLA Alusta"
 #define MSG_PREHEAT_PLA_SETTINGS            "Esilamm. PLA konf"
 #define MSG_PREHEAT_ABS                     "Esilammita ABS"
-#define MSG_PREHEAT_ABS0                    "Esilammita ABS 1"
-#define MSG_PREHEAT_ABS1                    "Esilammita ABS 2"
-#define MSG_PREHEAT_ABS2                    "Esilammita ABS 3"
-#define MSG_PREHEAT_ABS3                    "Esilammita ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Esila. ABS Kaikki"
+#define MSG_PREHEAT_ABS_N                   "Esilammita ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Esila. ABS Kaikki"
 #define MSG_PREHEAT_ABS_BEDONLY             "Esila. ABS Alusta"
 #define MSG_PREHEAT_ABS_SETTINGS            "Esilamm. ABS konf"
 #define MSG_COOLDOWN                        "Jaahdyta"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Move Y"
 #define MSG_MOVE_Z                          "Move Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
 #define MSG_SPEED                           "Nopeus"
 #define MSG_NOZZLE                          "Suutin"
-#define MSG_NOZZLE1                         "Suutin2"
-#define MSG_NOZZLE2                         "Suutin3"
 #define MSG_BED                             "Alusta"
 #define MSG_FAN_SPEED                       "Tuul. nopeus"
 #define MSG_FLOW                            "Virtaus"
-#define MSG_FLOW0                           "Virtaus 0"
-#define MSG_FLOW1                           "Virtaus 1"
-#define MSG_FLOW2                           "Virtaus 2"
 #define MSG_CONTROL                         "Kontrolli"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Kiihtyv"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,8 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Veda takaisin"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_fr.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Regler origine"
 #define MSG_PREHEAT_PLA                     "Prechauffage PLA"
-#define MSG_PREHEAT_PLA0                    "Prechauff. PLA 1"
-#define MSG_PREHEAT_PLA1                    "Prechauff. PLA 2"
-#define MSG_PREHEAT_PLA2                    "Prechauff. PLA 3"
-#define MSG_PREHEAT_PLA3                    "Prechauff. PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Prech. PLA Tout"
+#define MSG_PREHEAT_PLA_N                   "Prechauff. PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Prech. PLA Tout"
 #define MSG_PREHEAT_PLA_BEDONLY             "Prech. PLA Plateau"
 #define MSG_PREHEAT_PLA_SETTINGS            "Regl. prech. PLA"
 #define MSG_PREHEAT_ABS                     "Prechauffage ABS"
-#define MSG_PREHEAT_ABS0                    "Prechauff. ABS 1"
-#define MSG_PREHEAT_ABS1                    "Prechauff. ABS 2"
-#define MSG_PREHEAT_ABS2                    "Prechauff. ABS 3"
-#define MSG_PREHEAT_ABS3                    "Prechauff. ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Prech. ABS Tout"
+#define MSG_PREHEAT_ABS_N                   "Prechauff. ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Prech. ABS Tout"
 #define MSG_PREHEAT_ABS_BEDONLY             "Prech. ABS Plateau"
 #define MSG_PREHEAT_ABS_SETTINGS            "Regl. prech. ABS"
 #define MSG_COOLDOWN                        "Refroidir"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Move Y"
 #define MSG_MOVE_Z                          "Move Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
 #define MSG_SPEED                           " Vitesse"
 #define MSG_NOZZLE                          "Buse"
-#define MSG_NOZZLE1                         "Buse2"
-#define MSG_NOZZLE2                         "Buse3"
 #define MSG_BED                             "Plateau"
 #define MSG_FAN_SPEED                       "Vite. ventilateur"
 #define MSG_FLOW                            "Flux"
-#define MSG_FLOW0                           "Flux 0"
-#define MSG_FLOW1                           "Flux 1"
-#define MSG_FLOW2                           "Flux 2"
 #define MSG_CONTROL                         "Controler"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Accel"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,9 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Butee abandon"
 
-#define MSG_RECTRACT                        "Rectract"
-#define MSG_STEPPER_RELEASED                "RELACHE."
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_it.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Setta offset home"
 #define MSG_SET_ORIGIN                      "Imposta Origine"
 #define MSG_PREHEAT_PLA                     "Preriscalda PLA"
-#define MSG_PREHEAT_PLA0                    "Preriscalda PLA 1"
-#define MSG_PREHEAT_PLA1                    "Preriscalda PLA 2"
-#define MSG_PREHEAT_PLA2                    "Preriscalda PLA 3"
-#define MSG_PREHEAT_PLA3                    "Preriscalda PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Prer. PLA Tutto"
+#define MSG_PREHEAT_PLA_N                   "Preriscalda PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Prer. PLA Tutto"
 #define MSG_PREHEAT_PLA_BEDONLY             "Prer. PLA Piatto"
 #define MSG_PREHEAT_PLA_SETTINGS            "Config. prer. PLA"
 #define MSG_PREHEAT_ABS                     "Preriscalda ABS"
-#define MSG_PREHEAT_ABS0                    "Preriscalda ABS 1"
-#define MSG_PREHEAT_ABS1                    "Preriscalda ABS 2"
-#define MSG_PREHEAT_ABS2                    "Preriscalda ABS 3"
-#define MSG_PREHEAT_ABS3                    "Preriscalda ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Prer. ABS Tutto"
+#define MSG_PREHEAT_ABS_N                   "Preriscalda ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Prer. ABS Tutto"
 #define MSG_PREHEAT_ABS_BEDONLY             "Prer. ABS Piatto"
 #define MSG_PREHEAT_ABS_SETTINGS            "Config. prer. ABS"
 #define MSG_COOLDOWN                        "Raffredda"
@@ -43,28 +37,18 @@
 #define MSG_MOVE_Y                          "Muovi Y"
 #define MSG_MOVE_Z                          "Muovi Z"
 #define MSG_MOVE_E                          "Estrusore"
-#define MSG_MOVE_E1                         "Estrusore 2"
-#define MSG_MOVE_E2                         "Estrusore 3"
-#define MSG_MOVE_E3                         "Estrusore 4"
 #define MSG_MOVE_01MM                       "Muovi di 0.1mm"
 #define MSG_MOVE_1MM                        "Muovi di   1mm"
 #define MSG_MOVE_10MM                       "Muovi di  10mm"
 #define MSG_SPEED                           "Velcità"
 #define MSG_NOZZLE                          "Ugello"
-#define MSG_NOZZLE1                         "Ugello2"
-#define MSG_NOZZLE2                         "Ugello3"
-#define MSG_NOZZLE3                         "Ugello4"
 #define MSG_BED                             "Piatto"
 #define MSG_FAN_SPEED                       "Ventola"
 #define MSG_FLOW                            "Flusso"
-#define MSG_FLOW0                           "Flusso 0"
-#define MSG_FLOW1                           "Flusso 1"
-#define MSG_FLOW2                           "Flusso 2"
-#define MSG_FLOW3                           "Flusso 3"
 #define MSG_CONTROL                         "Controllo"
-#define MSG_MIN                             " \002 Min:"
-#define MSG_MAX                             " \002 Max:"
-#define MSG_FACTOR                          " \002 Fact:"
+#define MSG_MIN                             " \002 Min"
+#define MSG_MAX                             " \002 Max"
+#define MSG_FACTOR                          " \002 Fact"
 #define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "ON "
 #define MSG_OFF                             "OFF"
@@ -72,18 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
-#define MSG_PID_P3                          "PID-P E4"
-#define MSG_PID_I3                          "PID-I E4"
-#define MSG_PID_D3                          "PID-D E4"
-#define MSG_PID_C3                          "PID-C E4"
 #define MSG_ACC                             "Accel."
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -148,8 +120,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Finecorsa abort"
 
-#define MSG_RECTRACT                        "Ritrai"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Calibraz. Delta"
     #define MSG_DELTA_CALIBRATE_X           "Calibra X"

Marlin/language_nl.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Nulpunt instellen"
 #define MSG_PREHEAT_PLA                     "PLA voorverwarmen"
-#define MSG_PREHEAT_PLA0                    "PLA voorverw. 1"
-#define MSG_PREHEAT_PLA1                    "PLA voorverw. 2"
-#define MSG_PREHEAT_PLA2                    "PLA voorverw. 3"
-#define MSG_PREHEAT_PLA3                    "PLA voorverw. 4"
-#define MSG_PREHEAT_PLA0123                 "PLA voorverw. aan"
+#define MSG_PREHEAT_PLA_N                   "PLA voorverw. "
+#define MSG_PREHEAT_PLA_ALL                 "PLA voorverw. aan"
 #define MSG_PREHEAT_PLA_BEDONLY             "PLA voorverw. Bed"
 #define MSG_PREHEAT_PLA_SETTINGS            "PLA verw. conf"
 #define MSG_PREHEAT_ABS                     "ABS voorverwarmen"
-#define MSG_PREHEAT_ABS0                    "ABS voorverw. 1"
-#define MSG_PREHEAT_ABS1                    "ABS voorverw. 2"
-#define MSG_PREHEAT_ABS2                    "ABS voorverw. 3"
-#define MSG_PREHEAT_ABS3                    "ABS voorverw. 4"
-#define MSG_PREHEAT_ABS0123                 "ABS voorverw. aan"
+#define MSG_PREHEAT_ABS_N                   "ABS voorverw. "
+#define MSG_PREHEAT_ABS_ALL                 "ABS voorverw. aan"
 #define MSG_PREHEAT_ABS_BEDONLY             "ABS voorverw. Bed"
 #define MSG_PREHEAT_ABS_SETTINGS            "ABS verw. conf"
 #define MSG_COOLDOWN                        "Afkoelen"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Verplaats Y"
 #define MSG_MOVE_Z                          "Verplaats Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Verplaats 0.1mm"
 #define MSG_MOVE_1MM                        "Verplaats 1mm"
 #define MSG_MOVE_10MM                       "Verplaats 10mm"
 #define MSG_SPEED                           "Snelheid"
 #define MSG_NOZZLE                          "Nozzle"
-#define MSG_NOZZLE1                         "Nozzle2"
-#define MSG_NOZZLE2                         "Nozzle3"
 #define MSG_BED                             "Bed"
 #define MSG_FAN_SPEED                       "Fan snelheid"
 #define MSG_FLOW                            "Flow"
-#define MSG_FLOW0                           "Flow 0"
-#define MSG_FLOW1                           "Flow 1"
-#define MSG_FLOW2                           "Flow 2"
 #define MSG_CONTROL                         "Control"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Versn"
 #define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -140,8 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystap Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop afbr."
 
-#define MSG_RECTRACT                        "Terugtrekken"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_pl.h

@@ -18,19 +18,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Ustaw punkt zero"
 #define MSG_PREHEAT_PLA                     "Rozgrzej PLA"
-#define MSG_PREHEAT_PLA0                    "Rozgrzej PLA 1"
-#define MSG_PREHEAT_PLA1                    "Rozgrzej PLA 2"
-#define MSG_PREHEAT_PLA2                    "Rozgrzej PLA 3"
-#define MSG_PREHEAT_PLA3                    "Rozgrzej PLA 4"
-#define MSG_PREHEAT_PLA0123                 "Roz. PLA Wszystko"
+#define MSG_PREHEAT_PLA_N                   "Rozgrzej PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Roz. PLA Wszystko"
 #define MSG_PREHEAT_PLA_BEDONLY             "Rozgrzej PLA Loze"
 #define MSG_PREHEAT_PLA_SETTINGS            "Ustaw. rozg. PLA"
 #define MSG_PREHEAT_ABS                     "Rozgrzej ABS"
-#define MSG_PREHEAT_ABS0                    "Rozgrzej ABS 1"
-#define MSG_PREHEAT_ABS1                    "Rozgrzej ABS 2"
-#define MSG_PREHEAT_ABS2                    "Rozgrzej ABS 3"
-#define MSG_PREHEAT_ABS3                    "Rozgrzej ABS 4"
-#define MSG_PREHEAT_ABS0123                 "Roz. ABS Wszystko"
+#define MSG_PREHEAT_ABS_N                   "Rozgrzej ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Roz. ABS Wszystko"
 #define MSG_PREHEAT_ABS_BEDONLY             "Rozgrzej ABS Loze"
 #define MSG_PREHEAT_ABS_SETTINGS            "Ustaw. rozg. ABS"
 #define MSG_COOLDOWN                        "Chlodzenie"
@@ -43,21 +37,14 @@
 #define MSG_MOVE_Y                          "Przesun w Y"
 #define MSG_MOVE_Z                          "Przesun w Z"
 #define MSG_MOVE_E                          "Ekstruzja (os E)"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Przesuwaj co .1mm"
 #define MSG_MOVE_1MM                        "Przesuwaj co 1mm"
 #define MSG_MOVE_10MM                       "Przesuwaj co 10mm"
 #define MSG_SPEED                           "Predkosc"
 #define MSG_NOZZLE                          "Dysza"
-#define MSG_NOZZLE1                         "Dysza 2"
-#define MSG_NOZZLE2                         "Dysza 3"
 #define MSG_BED                             "Loze"
 #define MSG_FAN_SPEED                       "Obroty wiatraka"
 #define MSG_FLOW                            "Przeplyw"
-#define MSG_FLOW0                           "Przeplyw 0"
-#define MSG_FLOW1                           "Przeplyw 1"
-#define MSG_FLOW2                           "Przeplyw 2"
 #define MSG_CONTROL                         "Ustawienia"
 #define MSG_MIN                             " \002 Min"
 #define MSG_MAX                             " \002 Max"
@@ -69,14 +56,6 @@
 #define MSG_PID_I                           "PID-I"
 #define MSG_PID_D                           "PID-D"
 #define MSG_PID_C                           "PID-C"
-#define MSG_PID_P1                          "PID-P E2"
-#define MSG_PID_I1                          "PID-I E2"
-#define MSG_PID_D1                          "PID-D E2"
-#define MSG_PID_C1                          "PID-C E2"
-#define MSG_PID_P2                          "PID-P E3"
-#define MSG_PID_I2                          "PID-I E3"
-#define MSG_PID_D2                          "PID-D E3"
-#define MSG_PID_C2                          "PID-C E3"
 #define MSG_ACC                             "Przyspieszenie"
 #define MSG_VXY_JERK                        "Zryw Vxy"
 #define MSG_VZ_JERK                         "Zryw Vz"
@@ -124,7 +103,7 @@
 #define MSG_CONTROL_RETRACT                 "Wycofaj mm"
 #define MSG_CONTROL_RETRACT_SWAP            "Z Wycof. mm"
 #define MSG_CONTROL_RETRACTF                "Wycofaj  V"
-#define MSG_CONTROL_RETRACT_ZLIFT           "Skok Z mm:"
+#define MSG_CONTROL_RETRACT_ZLIFT           "Skok Z mm"
 #define MSG_CONTROL_RETRACT_RECOVER         "Cof. wycof. +mm"
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Z Cof. wyc. +mm"
 #define MSG_CONTROL_RETRACT_RECOVERF        "Cof. wycof.  V"
@@ -140,9 +119,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Blad wyl. kranc."
 
-#define MSG_RECTRACT                        "Wycofanie"
-#define MSG_STEPPER_RELEASED                "Zwolniony."
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/language_pt-br.h

@@ -0,0 +1,130 @@
+/**
+ * Portuguese (Brazil)
+ *
+ * LCD Menu Messages
+ * Please note these are limited to 17 characters!
+ *
+ */
+#ifndef LANGUAGE_PT_BR_H
+#define LANGUAGE_PT_BR_H
+
+#define WELCOME_MSG							MACHINE_NAME " pronto."
+#define MSG_SD_INSERTED                     "Cartao inserido"
+#define MSG_SD_REMOVED                      "Cartao removido"
+#define MSG_MAIN                            " Menu principal \003"
+#define MSG_AUTOSTART                       "Autostart"
+#define MSG_DISABLE_STEPPERS                " Apagar motores"
+#define MSG_AUTO_HOME                       "Ir para origen"
+#define MSG_SET_HOME_OFFSETS                "Set home offsets"
+#define MSG_SET_ORIGIN                      "Estabelecer orig."
+#define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
+#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA \002Base"
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA setting"
+#define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
+#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS \002Base"
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS setting"
+#define MSG_COOLDOWN                        "Esfriar"
+#define MSG_SWITCH_PS_ON                    "Switch Power On"
+#define MSG_SWITCH_PS_OFF                   "Switch Power Off"
+#define MSG_EXTRUDE                         "Extrudar"
+#define MSG_RETRACT                         "Retrair"
+#define MSG_MOVE_AXIS                       "Mover eixo      \x7E"
+#define MSG_MOVE_X                          "Move X"
+#define MSG_MOVE_Y                          "Move Y"
+#define MSG_MOVE_Z                          "Move Z"
+#define MSG_MOVE_E                          "Extruder"
+#define MSG_MOVE_01MM                       "Move 0.1mm"
+#define MSG_MOVE_1MM                        "Move 1mm"
+#define MSG_MOVE_10MM                       "Move 10mm"
+#define MSG_SPEED                           "Velocidade"
+#define MSG_NOZZLE                          "\002Nozzle"
+#define MSG_BED                             "\002Base"
+#define MSG_FAN_SPEED                       "Velocidade vento."
+#define MSG_FLOW                            "Fluxo"
+#define MSG_CONTROL                         "Controle \003"
+#define MSG_MIN                             "\002 Min"
+#define MSG_MAX                             "\002 Max"
+#define MSG_FACTOR                          "\002 Fact"
+#define MSG_AUTOTEMP                        "Autotemp"
+#define MSG_ON                              "On "
+#define MSG_OFF                             "Off"
+#define MSG_PID_P                           "PID-P"
+#define MSG_PID_I                           "PID-I"
+#define MSG_PID_D                           "PID-D"
+#define MSG_PID_C                           "PID-C"
+#define MSG_ACC                             "Acc"
+#define MSG_VXY_JERK                        "Vxy-jerk"
+#define MSG_VZ_JERK                         "Vz-jerk"
+#define MSG_VE_JERK                         "Ve-jerk"
+#define MSG_VMAX                            " Vmax "
+#define MSG_X                               "x"
+#define MSG_Y                               "y"
+#define MSG_Z                               "z"
+#define MSG_E                               "e"
+#define MSG_VMIN                            "Vmin"
+#define MSG_VTRAV_MIN                       "VTrav min"
+#define MSG_AMAX                            "Amax "
+#define MSG_A_RETRACT                       "A-retract"
+#define MSG_XSTEPS                          "Xpasso/mm"
+#define MSG_YSTEPS                          "Ypasso/mm"
+#define MSG_ZSTEPS                          "Zpasso/mm"
+#define MSG_ESTEPS                          "Epasso/mm"
+#define MSG_TEMPERATURE                     "Temperatura"
+#define MSG_MOTION                          "Movimento"
+#define MSG_VOLUMETRIC                      "Filament"
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
+#define MSG_CONTRAST                        "Contrast"
+#define MSG_STORE_EPROM                     "Guardar memoria"
+#define MSG_LOAD_EPROM                      "Carregar memoria"
+#define MSG_RESTORE_FAILSAFE                "Rest. de emergen."
+#define MSG_REFRESH                         "\004Recarregar"
+#define MSG_WATCH                           "Monitorar   \003"
+#define MSG_PREPARE                         "Preparar \x7E"
+#define MSG_TUNE                            "Tune    \x7E"
+#define MSG_PAUSE_PRINT                     "Pausar impressao"
+#define MSG_RESUME_PRINT                    "Resumir impressao"
+#define MSG_STOP_PRINT                      "Parar impressao"
+#define MSG_CARD_MENU                       "Menu cartao SD"
+#define MSG_NO_CARD                         "Sem cartao SD"
+#define MSG_DWELL                           "Repouso..."
+#define MSG_USERWAIT                        "Esperando ordem"
+#define MSG_RESUMING                        "Resuming print"
+#define MSG_PRINT_ABORTED                   "Print aborted"
+#define MSG_NO_MOVE                         "Sem movimento"
+#define MSG_KILLED                          "PARADA DE EMERG."
+#define MSG_STOPPED                         "PARADA. "
+#define MSG_CONTROL_RETRACT                 " Retrair mm"
+#define MSG_CONTROL_RETRACT_SWAP            "Troca Retrair mm"
+#define MSG_CONTROL_RETRACTF                " Retrair  V"
+#define MSG_CONTROL_RETRACT_ZLIFT           " Levantar mm"
+#define MSG_CONTROL_RETRACT_RECOVER         " DesRet +mm"
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Troca DesRet +mm"
+#define MSG_CONTROL_RETRACT_RECOVERF        " DesRet  V"
+#define MSG_AUTORETRACT                     " AutoRetr."
+#define MSG_FILAMENTCHANGE                  "Change filament"
+#define MSG_INIT_SDCARD                     "Init. SD-Card"
+#define MSG_CNG_SDCARD                      "Change SD-Card"
+#define MSG_ZPROBE_OUT                      "Son. fora da mesa"
+#define MSG_POSITION_UNKNOWN                "XY antes de Z"
+#define MSG_ZPROBE_ZOFFSET                  "Z Offset"
+#define MSG_BABYSTEP_X                      "Babystep X"
+#define MSG_BABYSTEP_Y                      "Babystep Y"
+#define MSG_BABYSTEP_Z                      "Babystep Z"
+#define MSG_ENDSTOP_ABORT                   "Endstop abort"
+
+#ifdef DELTA_CALIBRATION_MENU
+    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
+    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
+#endif // DELTA_CALIBRATION_MENU
+
+#endif // LANGUAGE_PT_BR_H

Marlin/language_pt.h

@@ -8,151 +8,123 @@
 #ifndef LANGUAGE_PT_H
 #define LANGUAGE_PT_H
 
-#define WELCOME_MSG							MACHINE_NAME " pronto."
+#define WELCOME_MSG                         MACHINE_NAME " pronto."
 #define MSG_SD_INSERTED                     "Cartao inserido"
 #define MSG_SD_REMOVED                      "Cartao removido"
 #define MSG_MAIN                            " Menu principal \003"
 #define MSG_AUTOSTART                       "Autostart"
-#define MSG_DISABLE_STEPPERS                " Apagar motores"
-#define MSG_AUTO_HOME                       "Ir para origen"
-#define MSG_SET_HOME_OFFSETS                "Set home offsets"
+#define MSG_DISABLE_STEPPERS                " Desligar motores"
+#define MSG_AUTO_HOME                       "Ir para home"
+#define MSG_SET_HOME_OFFSETS                "Def. home offsets"
 #define MSG_SET_ORIGIN                      "Estabelecer orig."
 #define MSG_PREHEAT_PLA                     "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA0                    " pre-aquecer PLA 1"
-#define MSG_PREHEAT_PLA1                    " pre-aquecer PLA 2"
-#define MSG_PREHEAT_PLA2                    " pre-aquecer PLA 3"
-#define MSG_PREHEAT_PLA3                    " pre-aquecer PLA 4"
-#define MSG_PREHEAT_PLA0123                 " pre-aq. PLA Tudo"
-#define MSG_PREHEAT_PLA_BEDONLY             " pre-aq. PLA \002Base"
-#define MSG_PREHEAT_PLA_SETTINGS            "PLA setting"
+#define MSG_PREHEAT_PLA_N                   "Pre-aquecer PLA "
+#define MSG_PREHEAT_PLA_ALL                 "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_PLA_BEDONLY             "Pre-aq. PLA \002Base"
+#define MSG_PREHEAT_PLA_SETTINGS            "PLA definicoes"
 #define MSG_PREHEAT_ABS                     "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS0                    " pre-aquecer ABS 1"
-#define MSG_PREHEAT_ABS1                    " pre-aquecer ABS 2"
-#define MSG_PREHEAT_ABS2                    " pre-aquecer ABS 3"
-#define MSG_PREHEAT_ABS3                    " pre-aquecer ABS 4"
-#define MSG_PREHEAT_ABS0123                 " pre-aq. ABS Tudo"
-#define MSG_PREHEAT_ABS_BEDONLY             " pre-aq. ABS \002Base"
-#define MSG_PREHEAT_ABS_SETTINGS            "ABS setting"
-#define MSG_COOLDOWN                        "Esfriar"
-#define MSG_SWITCH_PS_ON                    "Switch Power On"
-#define MSG_SWITCH_PS_OFF                   "Switch Power Off"
-#define MSG_EXTRUDE                         "Extrudar"
+#define MSG_PREHEAT_ABS_N                   "Pre-aquecer ABS "
+#define MSG_PREHEAT_ABS_ALL                 "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_ABS_BEDONLY             "Pre-aq. ABS \002Base"
+#define MSG_PREHEAT_ABS_SETTINGS            "ABS definicoes"
+#define MSG_COOLDOWN                        "Arrefecer"
+#define MSG_SWITCH_PS_ON                    "Ligar"
+#define MSG_SWITCH_PS_OFF                   "Desligar"
+#define MSG_EXTRUDE                         "Extrudir"
 #define MSG_RETRACT                         "Retrair"
 #define MSG_MOVE_AXIS                       "Mover eixo      \x7E"
-#define MSG_MOVE_X                          "Move X"
-#define MSG_MOVE_Y                          "Move Y"
-#define MSG_MOVE_Z                          "Move Z"
-#define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
-#define MSG_MOVE_01MM                       "Move 0.1mm"
-#define MSG_MOVE_1MM                        "Move 1mm"
-#define MSG_MOVE_10MM                       "Move 10mm"
-#define MSG_SPEED                           "Velocidade:"
-#define MSG_NOZZLE                          "\002Nozzle:"
-#define MSG_NOZZLE1                         "\002Nozzle2:"
-#define MSG_NOZZLE2                         "\002Nozzle3:"
-#define MSG_BED                             "\002Base:"
-#define MSG_FAN_SPEED                       "Velocidade vento."
-#define MSG_FLOW                            "Fluxo:"
-#define MSG_FLOW0                           "Fluxo0:"
-#define MSG_FLOW1                           "Fluxo1:"
-#define MSG_FLOW2                           "Fluxo2:"
-#define MSG_CONTROL                         "Controle \003"
-#define MSG_MIN                             "\002 Min:"
-#define MSG_MAX                             "\002 Max:"
-#define MSG_FACTOR                          "\002 Fact:"
-#define MSG_AUTOTEMP                        "Autotemp:"
+#define MSG_MOVE_X                          "Mover X"
+#define MSG_MOVE_Y                          "Mover Y"
+#define MSG_MOVE_Z                          "Mover Z"
+#define MSG_MOVE_E                          "Extrusor"
+#define MSG_MOVE_01MM                       "Mover 0.1mm"
+#define MSG_MOVE_1MM                        "Mover 1mm"
+#define MSG_MOVE_10MM                       "Mover 10mm"
+#define MSG_SPEED                           "Velocidade"
+#define MSG_NOZZLE                          "\002Bico"
+#define MSG_BED                             "\002Base"
+#define MSG_FAN_SPEED                       "Velocidade do ar."
+#define MSG_FLOW                            "Fluxo"
+#define MSG_CONTROL                         "Controlo \003"
+#define MSG_MIN                             "\002 Min"
+#define MSG_MAX                             "\002 Max"
+#define MSG_FACTOR                          "\002 Fact"
+#define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "On "
 #define MSG_OFF                             "Off"
-#define MSG_PID_P                           "PID-P: "
-#define MSG_PID_I                           "PID-I: "
-#define MSG_PID_D                           "PID-D: "
-#define MSG_PID_C                           "PID-C: "
-#define MSG_PID_P1                          "PID-P E2: "
-#define MSG_PID_I1                          "PID-I E2: "
-#define MSG_PID_D1                          "PID-D E2: "
-#define MSG_PID_C1                          "PID-C E2: "
-#define MSG_PID_P2                          "PID-P E3: "
-#define MSG_PID_I2                          "PID-I E3: "
-#define MSG_PID_D2                          "PID-D E3: "
-#define MSG_PID_C2                          "PID-C E3: "
-#define MSG_ACC                             "Acc:"
-#define MSG_VXY_JERK                        "Vxy-jerk: "
+#define MSG_PID_P                           "PID-P"
+#define MSG_PID_I                           "PID-I"
+#define MSG_PID_D                           "PID-D"
+#define MSG_PID_C                           "PID-C"
+#define MSG_ACC                             "Acc"
+#define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
 #define MSG_VE_JERK                         "Ve-jerk"
 #define MSG_VMAX                            " Vmax "
-#define MSG_X                               "x:"
-#define MSG_Y                               "y:"
-#define MSG_Z                               "z:"
-#define MSG_E                               "e:"
-#define MSG_VMIN                            "Vmin:"
-#define MSG_VTRAV_MIN                       "VTrav min:"
+#define MSG_X                               "x"
+#define MSG_Y                               "y"
+#define MSG_Z                               "z"
+#define MSG_E                               "e"
+#define MSG_VMIN                            "Vmin"
+#define MSG_VTRAV_MIN                       "VTrav min"
 #define MSG_AMAX                            "Amax "
-#define MSG_A_RETRACT                       "A-retract:"
-#define MSG_XSTEPS                          "Xpasso/mm:"
-#define MSG_YSTEPS                          "Ypasso/mm:"
-#define MSG_ZSTEPS                          "Zpasso/mm:"
-#define MSG_ESTEPS                          "Epasso/mm:"
+#define MSG_A_RETRACT                       "A-retract"
+#define MSG_XSTEPS                          "Xpasso/mm"
+#define MSG_YSTEPS                          "Ypasso/mm"
+#define MSG_ZSTEPS                          "Zpasso/mm"
+#define MSG_ESTEPS                          "Epasso/mm"
 #define MSG_TEMPERATURE                     "Temperatura"
 #define MSG_MOTION                          "Movimento"
-#define MSG_VOLUMETRIC                      "Filament"
+#define MSG_VOLUMETRIC                      "Filamento"
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
-#define MSG_CONTRAST                        "Contrast"
-#define MSG_STORE_EPROM                     "Guardar memoria"
-#define MSG_LOAD_EPROM                      "Carregar memoria"
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Diam. 1"
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Diam. 2"
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Diam. 3"
+#define MSG_CONTRAST                        "Contraste"
+#define MSG_STORE_EPROM                     "Guardar na memoria"
+#define MSG_LOAD_EPROM                      "Carregar da memoria"
 #define MSG_RESTORE_FAILSAFE                "Rest. de emergen."
 #define MSG_REFRESH                         "\004Recarregar"
 #define MSG_WATCH                           "Monitorar   \003"
 #define MSG_PREPARE                         "Preparar \x7E"
-#define MSG_TUNE                            "Tune    \x7E"
+#define MSG_TUNE                            "Afinar    \x7E"
 #define MSG_PAUSE_PRINT                     "Pausar impressao"
 #define MSG_RESUME_PRINT                    "Resumir impressao"
 #define MSG_STOP_PRINT                      "Parar impressao"
 #define MSG_CARD_MENU                       "Menu cartao SD"
 #define MSG_NO_CARD                         "Sem cartao SD"
 #define MSG_DWELL                           "Repouso..."
-#define MSG_USERWAIT                        "Esperando ordem"
-#define MSG_RESUMING                        "Resuming print"
-#define MSG_PRINT_ABORTED                   "Print aborted"
+#define MSG_USERWAIT                        "A espera de ordem"
+#define MSG_RESUMING                        "Resumir impressao"
+#define MSG_PRINT_ABORTED                   "Impr. Cancelada"
 #define MSG_NO_MOVE                         "Sem movimento"
-#define MSG_KILLED                          "PARADA DE EMERG."
-#define MSG_STOPPED                         "PARADA. "
-#define MSG_CONTROL_RETRACT                 " Retrair mm:"
-#define MSG_CONTROL_RETRACT_SWAP            "Troca Retrair mm:"
-#define MSG_CONTROL_RETRACTF                " Retrair  V:"
-#define MSG_CONTROL_RETRACT_ZLIFT           " Levantar mm:"
-#define MSG_CONTROL_RETRACT_RECOVER         " DesRet +mm:"
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Troca DesRet +mm:"
-#define MSG_CONTROL_RETRACT_RECOVERF        " DesRet  V:"
-#define MSG_AUTORETRACT                     " AutoRetr.:"
-#define MSG_FILAMENTCHANGE                  "Change filament"
-#define MSG_INIT_SDCARD                     "Init. SD-Card"
-#define MSG_CNG_SDCARD                      "Change SD-Card"
-#define MSG_ZPROBE_OUT                      "Son. fora da mesa"
+#define MSG_KILLED                          "INTRRP. DE EMERG."
+#define MSG_STOPPED                         "PARADO. "
+#define MSG_CONTROL_RETRACT                 " Retrair mm"
+#define MSG_CONTROL_RETRACT_SWAP            "Troca Retrair mm"
+#define MSG_CONTROL_RETRACTF                " Retrair  V"
+#define MSG_CONTROL_RETRACT_ZLIFT           " Levantar mm"
+#define MSG_CONTROL_RETRACT_RECOVER         " DesRet +mm"
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "Troca DesRet +mm"
+#define MSG_CONTROL_RETRACT_RECOVERF        " DesRet  V"
+#define MSG_AUTORETRACT                     " AutoRetr."
+#define MSG_FILAMENTCHANGE                  "Trocar filamento"
+#define MSG_INIT_SDCARD                     "Inic. SD-Card"
+#define MSG_CNG_SDCARD                      "Trocar SD-Card"
+#define MSG_ZPROBE_OUT                      "Sens. fora da Base"
 #define MSG_POSITION_UNKNOWN                "XY antes de Z"
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
 #define MSG_BABYSTEP_X                      "Babystep X"
 #define MSG_BABYSTEP_Y                      "Babystep Y"
 #define MSG_BABYSTEP_Z                      "Babystep Z"
-#define MSG_ENDSTOP_ABORT                   "Endstop abort"
-
-#define MSG_RECTRACT                        "Retrair"
-#define MSG_MAIN_WIDE                       "Menu Principal  \003"
-#define MSG_PREPARE_ALT                     "Preparar \003"
-#define MSG_CONTROL_ARROW                   "Controle \x7E"
-#define MSG_RETRACT_ARROW                   "Retrair \x7E"
-#define MSG_STEPPER_RELEASED                "Lancado."
+#define MSG_ENDSTOP_ABORT                   "Endstop abort."
 
 #ifdef DELTA_CALIBRATION_MENU
-    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
-    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
-    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
-    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
-    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
+    #define MSG_DELTA_CALIBRATE             "Delta Calibracao"
+    #define MSG_DELTA_CALIBRATE_X           "Calibrar X"
+    #define MSG_DELTA_CALIBRATE_Y           "Calibrar Y"
+    #define MSG_DELTA_CALIBRATE_Z           "Calibrar Z"
+    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrar Centro"
 #endif // DELTA_CALIBRATION_MENU
 
 #endif // LANGUAGE_PT_H

Marlin/language_ru.h

@@ -20,19 +20,13 @@
 #define MSG_SET_HOME_OFFSETS                "Set home offsets"
 #define MSG_SET_ORIGIN                      "Запомнить ноль"
 #define MSG_PREHEAT_PLA                     "Преднагрев PLA"
-#define MSG_PREHEAT_PLA0                    "Преднагрев PLA1"
-#define MSG_PREHEAT_PLA1                    "Преднагрев PLA2"
-#define MSG_PREHEAT_PLA2                    "Преднагрев PLA3"
-#define MSG_PREHEAT_PLA3                    "Преднагрев PLA4"
-#define MSG_PREHEAT_PLA0123                 "Преднаг. PLA все"
+#define MSG_PREHEAT_PLA_N                   "Преднагрев PLA"
+#define MSG_PREHEAT_PLA_ALL                 "Преднаг. PLA все"
 #define MSG_PREHEAT_PLA_BEDONLY             "Пред. PLA Кровать"
 #define MSG_PREHEAT_PLA_SETTINGS            "Настройки PLA"
 #define MSG_PREHEAT_ABS                     "Преднагрев ABS"
-#define MSG_PREHEAT_ABS0                    "Преднагрев ABS1"
-#define MSG_PREHEAT_ABS1                    "Преднагрев ABS2"
-#define MSG_PREHEAT_ABS2                    "Преднагрев ABS3"
-#define MSG_PREHEAT_ABS3                    "Преднагрев ABS4"
-#define MSG_PREHEAT_ABS0123                 "Преднаг. ABS все "
+#define MSG_PREHEAT_ABS_N                   "Преднагрев ABS"
+#define MSG_PREHEAT_ABS_ALL                 "Преднаг. ABS все "
 #define MSG_PREHEAT_ABS_BEDONLY             "Пред. ABS Кровать"
 #define MSG_PREHEAT_ABS_SETTINGS            "Настройки ABS"
 #define MSG_COOLDOWN                        "Охлаждение"
@@ -45,57 +39,42 @@
 #define MSG_MOVE_Y                          "Move Y"
 #define MSG_MOVE_Z                          "Move Z"
 #define MSG_MOVE_E                          "Extruder"
-#define MSG_MOVE_E1                         "Extruder2"
-#define MSG_MOVE_E2                         "Extruder3"
 #define MSG_MOVE_01MM                       "Move 0.1mm"
 #define MSG_MOVE_1MM                        "Move 1mm"
 #define MSG_MOVE_10MM                       "Move 10mm"
-#define MSG_SPEED                           "Скорость:"
-#define MSG_NOZZLE                          "\002 Фильера:"
-#define MSG_NOZZLE1                         "\002 Фильера2:"
-#define MSG_NOZZLE2                         "\002 Фильера3:"
-#define MSG_BED                             "\002 Кровать:"
-#define MSG_FAN_SPEED                       "Куллер:"
-#define MSG_FLOW                            "Поток:"
-#define MSG_FLOW0                           " Поток0:"
-#define MSG_FLOW1                           " Поток1:"
-#define MSG_FLOW2                           " Поток2:"
+#define MSG_SPEED                           "Скорость"
+#define MSG_NOZZLE                          "\002 Фильера"
+#define MSG_BED                             "\002 Кровать"
+#define MSG_FAN_SPEED                       "Куллер"
+#define MSG_FLOW                            "Поток"
 #define MSG_CONTROL                         "Настройки \003"
-#define MSG_MIN                             "\002 Минимум:"
-#define MSG_MAX                             "\002 Максимум:"
-#define MSG_FACTOR                          "\002 Фактор:"
-#define MSG_AUTOTEMP                        "Autotemp:"
+#define MSG_MIN                             "\002 Минимум"
+#define MSG_MAX                             "\002 Максимум"
+#define MSG_FACTOR                          "\002 Фактор"
+#define MSG_AUTOTEMP                        "Autotemp"
 #define MSG_ON                              "Вкл. "
 #define MSG_OFF                             "Выкл. "
-#define MSG_PID_P                           "PID-P: "
-#define MSG_PID_I                           "PID-I: "
-#define MSG_PID_D                           "PID-D: "
-#define MSG_PID_C                           "PID-C: "
-#define MSG_PID_P1                          "PID-P E2: "
-#define MSG_PID_I1                          "PID-I E2: "
-#define MSG_PID_D1                          "PID-D E2: "
-#define MSG_PID_C1                          "PID-C E2: "
-#define MSG_PID_P2                          "PID-P E3: "
-#define MSG_PID_I2                          "PID-I E3: "
-#define MSG_PID_D2                          "PID-D E3: "
-#define MSG_PID_C2                          "PID-C E3: "
-#define MSG_ACC                             "Acc:"
-#define MSG_VXY_JERK                        "Vxy-jerk: "
+#define MSG_PID_P                           "PID-P"
+#define MSG_PID_I                           "PID-I"
+#define MSG_PID_D                           "PID-D"
+#define MSG_PID_C                           "PID-C"
+#define MSG_ACC                             "Acc"
+#define MSG_VXY_JERK                        "Vxy-jerk"
 #define MSG_VZ_JERK                         "Vz-jerk"
 #define MSG_VE_JERK                         "Ve-jerk"
 #define MSG_VMAX                            "Vmax "
-#define MSG_X                               "x:"
-#define MSG_Y                               "y:"
-#define MSG_Z                               "z:"
-#define MSG_E                               "e:"
-#define MSG_VMIN                            "Vmin:"
-#define MSG_VTRAV_MIN                       "VTrav min:"
+#define MSG_X                               "x"
+#define MSG_Y                               "y"
+#define MSG_Z                               "z"
+#define MSG_E                               "e"
+#define MSG_VMIN                            "Vmin"
+#define MSG_VTRAV_MIN                       "VTrav min"
 #define MSG_AMAX                            "Amax "
-#define MSG_A_RETRACT                       "A-retract:"
-#define MSG_XSTEPS                          "X шаг/mm:"
-#define MSG_YSTEPS                          "Y шаг/mm:"
-#define MSG_ZSTEPS                          "Z шаг/mm:"
-#define MSG_ESTEPS                          "E шаг/mm:"
+#define MSG_A_RETRACT                       "A-retract"
+#define MSG_XSTEPS                          "X шаг/mm"
+#define MSG_YSTEPS                          "Y шаг/mm"
+#define MSG_ZSTEPS                          "Z шаг/mm"
+#define MSG_ESTEPS                          "E шаг/mm"
 #define MSG_TEMPERATURE                     "Температура     \x7E"
 #define MSG_MOTION                          "Скорости        \x7E"
 #define MSG_VOLUMETRIC                      "Filament"
@@ -123,14 +102,14 @@
 #define MSG_NO_MOVE                         "Нет движения."
 #define MSG_KILLED                          "УБИТО."
 #define MSG_STOPPED                         "ОСТАНОВЛЕНО."
-#define MSG_CONTROL_RETRACT                 "Откат mm:"
-#define MSG_CONTROL_RETRACT_SWAP            "своп Откат mm:"
-#define MSG_CONTROL_RETRACTF                "Откат  V:"
-#define MSG_CONTROL_RETRACT_ZLIFT           "Прыжок mm:"
-#define MSG_CONTROL_RETRACT_RECOVER         "Возврат +mm:"
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "своп Возврат +mm:"
-#define MSG_CONTROL_RETRACT_RECOVERF        "Возврат  V:"
-#define MSG_AUTORETRACT                     "АвтоОткат:"
+#define MSG_CONTROL_RETRACT                 "Откат mm"
+#define MSG_CONTROL_RETRACT_SWAP            "своп Откат mm"
+#define MSG_CONTROL_RETRACTF                "Откат  V"
+#define MSG_CONTROL_RETRACT_ZLIFT           "Прыжок mm"
+#define MSG_CONTROL_RETRACT_RECOVER         "Возврат +mm"
+#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "своп Возврат +mm"
+#define MSG_CONTROL_RETRACT_RECOVERF        "Возврат  V"
+#define MSG_AUTORETRACT                     "АвтоОткат"
 #define MSG_FILAMENTCHANGE                  "Change filament"
 #define MSG_INIT_SDCARD                     "Init. SD-Card"
 #define MSG_CNG_SDCARD                      "Change SD-Card"
@@ -142,8 +121,6 @@
 #define MSG_BABYSTEP_Z                      "Babystep Z"
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
 
-#define MSG_RECTRACT                        "Откат подачи    \x7E"
-
 #ifdef DELTA_CALIBRATION_MENU
     #define MSG_DELTA_CALIBRATE             "Delta Calibration"
     #define MSG_DELTA_CALIBRATE_X           "Calibrate X"

Marlin/ultralcd.cpp

@@ -426,13 +426,13 @@ static void lcd_tune_menu()
     MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_1 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_2 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE2, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_3 != 0
-    MENU_ITEM_EDIT(int3, MSG_NOZZLE3, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
+    MENU_ITEM_EDIT(int3, MSG_NOZZLE " 4", &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
 #endif
 
 
@@ -441,15 +441,15 @@ static void lcd_tune_menu()
 #endif
     MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
     MENU_ITEM_EDIT(int3, MSG_FLOW, &extrudemultiply, 10, 999);
-    MENU_ITEM_EDIT(int3, MSG_FLOW0, &extruder_multiply[0], 10, 999);
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 0", &extruder_multiply[0], 10, 999);
 #if TEMP_SENSOR_1 != 0
-    MENU_ITEM_EDIT(int3, MSG_FLOW1, &extruder_multiply[1], 10, 999);
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 1", &extruder_multiply[1], 10, 999);
 #endif
 #if TEMP_SENSOR_2 != 0
-    MENU_ITEM_EDIT(int3, MSG_FLOW2, &extruder_multiply[2], 10, 999);
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 2", &extruder_multiply[2], 10, 999);
 #endif
 #if TEMP_SENSOR_3 != 0
-    MENU_ITEM_EDIT(int3, MSG_FLOW3, &extruder_multiply[3], 10, 999);
+    MENU_ITEM_EDIT(int3, MSG_FLOW " 3", &extruder_multiply[3], 10, 999);
 #endif
 
 
@@ -591,18 +591,18 @@ static void lcd_preheat_pla_menu()
 {
   START_MENU();
   MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
-  MENU_ITEM(function, MSG_PREHEAT_PLA0, lcd_preheat_pla0);
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "1", lcd_preheat_pla0);
 #if TEMP_SENSOR_1 != 0 //2 extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_PLA1, lcd_preheat_pla1);
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "2", lcd_preheat_pla1);
 #endif //2 extruder preheat
 #if TEMP_SENSOR_2 != 0 //3 extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_PLA2, lcd_preheat_pla2);
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "3", lcd_preheat_pla2);
 #endif //3 extruder preheat
 #if TEMP_SENSOR_3 != 0 //4 extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_PLA3, lcd_preheat_pla3);
+  MENU_ITEM(function, MSG_PREHEAT_PLA_N "4", lcd_preheat_pla3);
 #endif //4 extruder preheat
 #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 //all extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_PLA0123, lcd_preheat_pla0123);
+  MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
 #endif //all extruder preheat
 #if TEMP_SENSOR_BED != 0
   MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
@@ -614,18 +614,18 @@ static void lcd_preheat_abs_menu()
 {
   START_MENU();
   MENU_ITEM(back, MSG_PREPARE, lcd_prepare_menu);
-  MENU_ITEM(function, MSG_PREHEAT_ABS0, lcd_preheat_abs0);
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "1", lcd_preheat_abs0);
 #if TEMP_SENSOR_1 != 0 //2 extruder preheat
-	MENU_ITEM(function, MSG_PREHEAT_ABS1, lcd_preheat_abs1);
+	MENU_ITEM(function, MSG_PREHEAT_ABS_N "2", lcd_preheat_abs1);
 #endif //2 extruder preheat
 #if TEMP_SENSOR_2 != 0 //3 extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_ABS2, lcd_preheat_abs2);
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "3", lcd_preheat_abs2);
 #endif //3 extruder preheat
 #if TEMP_SENSOR_3 != 0 //4 extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_ABS3, lcd_preheat_abs3);
+  MENU_ITEM(function, MSG_PREHEAT_ABS_N "4", lcd_preheat_abs3);
 #endif //4 extruder preheat
 #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 //all extruder preheat
-  MENU_ITEM(function, MSG_PREHEAT_ABS0123, lcd_preheat_abs0123);
+  MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
 #endif //all extruder preheat
 
 #if TEMP_SENSOR_BED != 0
@@ -812,13 +812,13 @@ static void lcd_control_temperature_menu()
   MENU_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_1 != 0
-  MENU_ITEM_EDIT(int3, MSG_NOZZLE1, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
+  MENU_ITEM_EDIT(int3, MSG_NOZZLE " 2", &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_2 != 0
-  MENU_ITEM_EDIT(int3, MSG_NOZZLE2, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
+  MENU_ITEM_EDIT(int3, MSG_NOZZLE " 3", &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_3 != 0
-  MENU_ITEM_EDIT(int3, MSG_NOZZLE3, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
+  MENU_ITEM_EDIT(int3, MSG_NOZZLE " 4", &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
 #endif
 #if TEMP_SENSOR_BED != 0
   MENU_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
@@ -848,12 +848,12 @@ static void lcd_control_temperature_menu()
 	  pid_current_extruder = 0;
 	  raw_Ki = unscalePID_i(PID_PARAM(Ki,1));
 	  raw_Kd = unscalePID_d(PID_PARAM(Kd,1));
-	  MENU_ITEM_EDIT(float52, MSG_PID_P1, &PID_PARAM(Kp,1), 1, 9990);
+	  MENU_ITEM_EDIT(float52, MSG_PID_P " E2", &PID_PARAM(Kp,1), 1, 9990);
 	  // i is typically a small value so allows values below 1
-	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I1, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D1, &raw_Kd, 1, 9990, copy_and_scalePID_d);
+	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E2", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
+	  MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E2", &raw_Kd, 1, 9990, copy_and_scalePID_d);
       #ifdef PID_ADD_EXTRUSION_RATE
-	    MENU_ITEM_EDIT(float3, MSG_PID_C1, &PID_PARAM(Kc,1), 1, 9990);
+	    MENU_ITEM_EDIT(float3, MSG_PID_C " E2", &PID_PARAM(Kc,1), 1, 9990);
       #endif//PID_ADD_EXTRUSION_RATE
   #endif//EXTRUDERS > 1
   #if EXTRUDERS > 2
@@ -861,12 +861,12 @@ static void lcd_control_temperature_menu()
 	    pid_current_extruder = 0;
 	    raw_Ki = unscalePID_i(PID_PARAM(Ki,2));
 	    raw_Kd = unscalePID_d(PID_PARAM(Kd,2));
-	    MENU_ITEM_EDIT(float52, MSG_PID_P2, &PID_PARAM(Kp,2), 1, 9990);
+	    MENU_ITEM_EDIT(float52, MSG_PID_P " E3", &PID_PARAM(Kp,2), 1, 9990);
 	    // i is typically a small value so allows values below 1
-	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I2, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
-	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D2, &raw_Kd, 1, 9990, copy_and_scalePID_d);
+	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I " E3", &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
+	    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D " E3", &raw_Kd, 1, 9990, copy_and_scalePID_d);
         #ifdef PID_ADD_EXTRUSION_RATE
-	      MENU_ITEM_EDIT(float3, MSG_PID_C2, &PID_PARAM(Kc,2), 1, 9990);
+	      MENU_ITEM_EDIT(float3, MSG_PID_C " E3", &PID_PARAM(Kc,2), 1, 9990);
         #endif//PID_ADD_EXTRUSION_RATE
   #endif//EXTRUDERS > 2
 #endif // PID_PARAMS_PER_EXTRUDER