Use preheat labels in place of PLA/ABS (#12194)

Marlin/Configuration_adv.h

@@ -1632,10 +1632,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/default/Configuration_adv.h

@@ -1632,10 +1632,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Anet/A2/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Anet/A6/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Anet/A8/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/ArmEd/Configuration_adv.h

@@ -1637,10 +1637,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h

@@ -1639,10 +1639,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Cartesio/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h

@@ -1634,10 +1634,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Einstart-S/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Einstart-S/readme.md

@@ -10,7 +10,7 @@ The Einstart S is a commercial machine that ships with a proprietary firmware an
  - Genuine Minebea NEMA17 motors (200 steps/rev)
  - THC7128 3A Stepper Drivers (configured for 16 microsteps, loud)
  - 160x160 magnetically coupled non-heated bed
- - PLA Only Direct Drive extruder
+ - PLA-only, Direct Drive extruder
  - SH1106 OLED Display w/ Cardinal navigation
  - 9533 I2C PWM RGB LED Chassis illumination
  - Onboard SD-Card Support

Marlin/src/config/examples/Felix/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h

@@ -1619,10 +1619,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/MakerParts/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Malyan/M150/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Malyan/M200/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h

@@ -1639,10 +1639,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/RigidBot/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/SCARA/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Sanguinololu/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/TheBorg/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/TinyBoy2/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h

@@ -1644,10 +1644,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/generic/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h

@@ -1633,10 +1633,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/makibox/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h

@@ -1631,10 +1631,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/config/examples/wt150/Configuration_adv.h

@@ -1632,10 +1632,10 @@
   #define USER_DESC_1 "Home & UBL Info"
   #define USER_GCODE_1 "G28\nG29 W"
 
-  #define USER_DESC_2 "Preheat for PLA"
+  #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL
   #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND)
 
-  #define USER_DESC_3 "Preheat for ABS"
+  #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL
   #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND)
 
   #define USER_DESC_4 "Heat Bed/Home/Level"

Marlin/src/gcode/lcd/M145.cpp

@@ -30,7 +30,7 @@
 /**
  * M145: Set the heatup state for a material in the LCD menu
  *
- *   S<material> (0=PLA, 1=ABS)
+ *   S<material>
  *   H<hotend temp>
  *   B<bed temp>
  *   F<fan speed>

Marlin/src/inc/Conditionals_LCD.h

@@ -525,7 +525,7 @@
 #endif
 
 #ifndef PREHEAT_2_LABEL
-  #define PREHEAT_1_LABEL "ABS"
+  #define PREHEAT_2_LABEL "ABS"
 #endif
 
 /**

Marlin/src/lcd/language/language_an.h

@@ -52,12 +52,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Achustar desfases")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Desfase aplicau")
 #define MSG_SET_ORIGIN                      _UxGT("Establir orichen")
-#define MSG_PREHEAT_1                       _UxGT("Precalentar PLA")
+#define MSG_PREHEAT_1                       _UxGT("Precalentar " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Tot")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Base")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" Conf")
-#define MSG_PREHEAT_2                       _UxGT("Precalentar ABS")
+#define MSG_PREHEAT_2                       _UxGT("Precalentar " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Tot")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Base")

Marlin/src/lcd/language/language_bg.h

@@ -43,16 +43,16 @@
 #define MSG_TMC_Z_CALIBRATION               _UxGT("Калибровка Z")
 #define MSG_SET_HOME_OFFSETS                _UxGT("Задай Начало")
 #define MSG_SET_ORIGIN                      _UxGT("Изходна точка")
-#define MSG_PREHEAT_1                       _UxGT("Подгряване PLA")
+#define MSG_PREHEAT_1                       _UxGT("Подгряване " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Подгряване PLA")
+#define MSG_PREHEAT_1_N                     _UxGT("Подгряване " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_ALL                   _UxGT("Подгр. PLA Всички")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Подгр. " PREHEAT_1_LABEL " Всички")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Подгр. PLA Легло")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Подгр. " PREHEAT_1_LABEL " Легло")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Настройки PLA")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Настройки " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_2                       _UxGT("Подгряване ABS")
+#define MSG_PREHEAT_2                       _UxGT("Подгряване " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Подгряване ABS")
+#define MSG_PREHEAT_2_N                     _UxGT("Подгряване " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_ALL                   _UxGT("Подгр. ABS Всички")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Подгр. " PREHEAT_2_LABEL " Всички")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Подгр. ABS Легло")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Подгр. " PREHEAT_2_LABEL " Легло")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Настройки ABS")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Настройки " PREHEAT_2_LABEL)
 #define MSG_COOLDOWN                        _UxGT("Охлаждане")
 #define MSG_SWITCH_PS_ON                    _UxGT("Вкл. захранване")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Изкл. захранване")

Marlin/src/lcd/language/language_ca.h

@@ -53,12 +53,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ajusta decalatge")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Decalatge aplicat")
 #define MSG_SET_ORIGIN                      _UxGT("Estableix origen")
-#define MSG_PREHEAT_1                       _UxGT("Preescalfa PLA")
+#define MSG_PREHEAT_1                       _UxGT("Preescalfa " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Tot")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Llit")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" Conf.")
-#define MSG_PREHEAT_2                       _UxGT("Preescalfa ABS")
+#define MSG_PREHEAT_2                       _UxGT("Preescalfa " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Tot")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Llit")

Marlin/src/lcd/language/language_cz.h

@@ -62,13 +62,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Nastavit ofsety")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Ofsety nastaveny")
 #define MSG_SET_ORIGIN                      _UxGT("Nastavit počátek")
-#define MSG_PREHEAT_1                       _UxGT("Zahřát PLA")
+#define MSG_PREHEAT_1                       _UxGT("Zahřát " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" vše")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" hotend")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" podlož")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" nast")
-#define MSG_PREHEAT_2                       _UxGT("Zahřát ABS")
+#define MSG_PREHEAT_2                       _UxGT("Zahřát " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" vše")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" hotend")
@@ -97,25 +97,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Přesun na další")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Aktivovat UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Deaktivovat UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Teplota podložky")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Teplota podložky")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Teplota hotendu")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Teplota hotendu")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Úprava sítě bodů")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Upravit vlastní síť")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Doladit síť bodů")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Konec úprav sítě")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Vlastní síť")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Vlastní síť")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Vytvořit síť")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Síť bodu PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Síť bodu " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Síť bodu ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Síť bodu " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Studená síť bodů")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Upravit výšku sítě")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Výška")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Zkontrolovat síť")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Kontrola sítě PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Kontrola sítě " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Kontrola sítě ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Kontrola sítě " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Kontrola vlast. sítě")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Kontrola vlast. sítě")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Pokračovat v síťi")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Síťové rovnání")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3-bodove rovnání")

Marlin/src/lcd/language/language_da.h

@@ -52,16 +52,16 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Sæt forsk. af home")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Forsk. er nu aktiv")
 #define MSG_SET_ORIGIN                      _UxGT("Sæt origin")
-#define MSG_PREHEAT_1                       _UxGT("Forvarm PLA")
+#define MSG_PREHEAT_1                       _UxGT("Forvarm " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Forvarm PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Forvarm " PREHEAT_1_LABEL " ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Forvarm PLA Alle")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Forvarm " PREHEAT_1_LABEL " Alle")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Forvarm PLA Bed")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Forvarm " PREHEAT_1_LABEL " Bed")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Forvarm PLA conf")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Forvarm " PREHEAT_1_LABEL " conf")
-#define MSG_PREHEAT_2                       _UxGT("Forvarm ABS")
+#define MSG_PREHEAT_2                       _UxGT("Forvarm " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Forvarm ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Forvarm " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Forvarm ABS Alle")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Forvarm " PREHEAT_2_LABEL " Alle")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Forvarm ABS Bed")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Forvarm " PREHEAT_2_LABEL " Bed")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Forvarm ABS conf")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Forvarm " PREHEAT_2_LABEL " conf")
 #define MSG_COOLDOWN                        _UxGT("Afkøl")
 #define MSG_SWITCH_PS_ON                    _UxGT("Slå strøm til")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Slå strøm fra")

Marlin/src/lcd/language/language_de.h

@@ -60,18 +60,18 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Setze Homeversatz")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Homeversatz aktiv")
 #define MSG_SET_ORIGIN                      _UxGT("Setze Nullpunkte") //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
-#define MSG_PREHEAT_1                       _UxGT("Vorwärmen PLA")
+#define MSG_PREHEAT_1                       _UxGT("Vorwärmen " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Vorwärmen PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Vorwärmen " PREHEAT_1_LABEL " ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Vorw. PLA Alles")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Vorw. " PREHEAT_1_LABEL " Alles")
-#define MSG_PREHEAT_1_END                   _UxGT("Vorw. PLA Extr.")
+#define MSG_PREHEAT_1_END                   _UxGT("Vorw. " PREHEAT_1_LABEL " Extr.")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Vorw. PLA Bett")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Vorw. " PREHEAT_1_LABEL " Bett")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Vorw. PLA Einst.")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Vorw. " PREHEAT_1_LABEL " Einst.")
-#define MSG_PREHEAT_2                       _UxGT("Vorwärmen ABS")
+#define MSG_PREHEAT_2                       _UxGT("Vorwärmen " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Vorwärmen ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Vorwärmen " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Vorw. ABS Alles")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Vorw. " PREHEAT_2_LABEL " Alles")
-#define MSG_PREHEAT_2_END                   _UxGT("Vorw. ABS Extr.")
+#define MSG_PREHEAT_2_END                   _UxGT("Vorw. " PREHEAT_2_LABEL " Extr.")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Vorw. ABS Bett")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Vorw. " PREHEAT_2_LABEL " Bett")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Vorw. ABS Einst.")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Vorw. " PREHEAT_2_LABEL " Einst.")
 #define MSG_PREHEAT_CUSTOM                  _UxGT("benutzerdef. Heizen")
 #define MSG_COOLDOWN                        _UxGT("Abkühlen")
 #define MSG_SWITCH_PS_ON                    _UxGT("Netzteil ein")
@@ -105,25 +105,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Nächster Punkt...")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("UBL aktivieren")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("UBL deaktivieren")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Betttemperatur")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Betttemperatur")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Hotend-Temp.")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Hotend-Temp.")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Netz bearbeiten")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Eigenes Netz bearb.")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Feineinstellung...")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Bearbeitung beendet")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Eigenes Netz erst.")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Eigenes Netz erst.")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Netz erstellen")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Netz erstellen PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Netz erstellen " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Netz erstellen ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Netz erstellen " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Netz erstellen kalt")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Netzhöhe einst.")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Höhe")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Netz validieren")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Netz validieren PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Netz validieren " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Netz validieren ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Netz validieren " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Eig. Netz validieren")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Eig. Netz validieren")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Netzerst. forts.")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Netz-Nivellierung")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3-Punkt-Nivell.")

Marlin/src/lcd/language/language_el-gr.h

@@ -52,12 +52,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ορισμός βασικών μετατοπίσεων")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Εφαρμόστηκαν οι μετατοπίσεις")
 #define MSG_SET_ORIGIN                      _UxGT("Ορισμός προέλευσης")
-#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση PLA")
+#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" όλα")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" κλίνη")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" επιβεβαίωση")
-#define MSG_PREHEAT_2                       _UxGT("Προθέρμανση ABS")
+#define MSG_PREHEAT_2                       _UxGT("Προθέρμανση " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" όλα")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Bed")

Marlin/src/lcd/language/language_el.h

@@ -52,12 +52,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ορισμός βασικών μετατοπίσεων") //SHORTEN
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Εφαρμόστηκαν οι μετατοπίσεις") //SHORTEN
 #define MSG_SET_ORIGIN                      _UxGT("Ορισμός προέλευσης")
-#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση PLA")
+#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" όλα")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" bed") //SHORTEN
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" επιβεβαίωση") //SHORTEN
-#define MSG_PREHEAT_2                       _UxGT("Προθέρμανση ABS")
+#define MSG_PREHEAT_2                       _UxGT("Προθέρμανση " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" όλα")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" bed") //SHORTEN

Marlin/src/lcd/language/language_en.h

@@ -253,17 +253,17 @@
 #ifndef MSG_UBL_DEACTIVATE_MESH
   #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Deactivate UBL")
 #endif
-#ifndef MSG_UBL_SET_BED_TEMP
+#ifndef MSG_UBL_SET_TEMP_BED
-  #define MSG_UBL_SET_BED_TEMP                _UxGT("Bed Temp")
+  #define MSG_UBL_SET_TEMP_BED                _UxGT("Bed Temp")
 #endif
-#ifndef MSG_UBL_CUSTOM_BED_TEMP
+#ifndef MSG_UBL_BED_TEMP_CUSTOM
-  #define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+  #define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
 #endif
-#ifndef MSG_UBL_SET_HOTEND_TEMP
+#ifndef MSG_UBL_SET_TEMP_HOTEND
-  #define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Hotend Temp")
+  #define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Hotend Temp")
 #endif
-#ifndef MSG_UBL_CUSTOM_HOTEND_TEMP
+#ifndef MSG_UBL_HOTEND_TEMP_CUSTOM
-  #define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+  #define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #endif
 #ifndef MSG_UBL_MESH_EDIT
   #define MSG_UBL_MESH_EDIT                   _UxGT("Mesh Edit")
@@ -277,17 +277,17 @@
 #ifndef MSG_UBL_DONE_EDITING_MESH
   #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Done Editing Mesh")
 #endif
-#ifndef MSG_UBL_BUILD_CUSTOM_MESH
+#ifndef MSG_UBL_BUILD_MESH_CUSTOM
-  #define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Build Custom Mesh")
+  #define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Build Custom Mesh")
 #endif
 #ifndef MSG_UBL_BUILD_MESH_MENU
   #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Build Mesh")
 #endif
-#ifndef MSG_UBL_BUILD_PLA_MESH
+#ifndef MSG_UBL_BUILD_MESH_M1
-  #define MSG_UBL_BUILD_PLA_MESH              _UxGT("Build PLA Mesh")
+  #define MSG_UBL_BUILD_MESH_M1               _UxGT("Build Mesh (" PREHEAT_1_LABEL ")")
 #endif
-#ifndef MSG_UBL_BUILD_ABS_MESH
+#ifndef MSG_UBL_BUILD_MESH_M2
-  #define MSG_UBL_BUILD_ABS_MESH              _UxGT("Build ABS Mesh")
+  #define MSG_UBL_BUILD_MESH_M2               _UxGT("Build Mesh (" PREHEAT_2_LABEL ")")
 #endif
 #ifndef MSG_UBL_BUILD_COLD_MESH
   #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Build Cold Mesh")
@@ -301,14 +301,14 @@
 #ifndef MSG_UBL_VALIDATE_MESH_MENU
   #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Validate Mesh")
 #endif
-#ifndef MSG_UBL_VALIDATE_PLA_MESH
+#ifndef MSG_UBL_VALIDATE_MESH_M1
-  #define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Validate PLA Mesh")
+  #define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Validate Mesh (" PREHEAT_1_LABEL ")")
 #endif
-#ifndef MSG_UBL_VALIDATE_ABS_MESH
+#ifndef MSG_UBL_VALIDATE_MESH_M2
-  #define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Validate ABS Mesh")
+  #define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Validate Mesh (" PREHEAT_2_LABEL ")")
 #endif
-#ifndef MSG_UBL_VALIDATE_CUSTOM_MESH
+#ifndef MSG_UBL_VALIDATE_MESH_CUSTOM
-  #define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Validate Custom Mesh")
+  #define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Validate Custom Mesh")
 #endif
 #ifndef MSG_UBL_CONTINUE_MESH
   #define MSG_UBL_CONTINUE_MESH               _UxGT("Continue Bed Mesh")

Marlin/src/lcd/language/language_es.h

@@ -55,13 +55,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ajustar desfases")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Desfase aplicado")
 #define MSG_SET_ORIGIN                      _UxGT("Establecer origen")
-#define MSG_PREHEAT_1                       _UxGT("Precalentar PLA")
+#define MSG_PREHEAT_1                       _UxGT("Precalentar " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Todo")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" End")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Cama")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" Config")
-#define MSG_PREHEAT_2                       _UxGT("Precalentar ABS")
+#define MSG_PREHEAT_2                       _UxGT("Precalentar " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Todo")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" End")

Marlin/src/lcd/language/language_eu.h

@@ -56,13 +56,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Etxe. offset eza.")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsetak ezarrita")
 #define MSG_SET_ORIGIN                      _UxGT("Hasiera ipini")
-#define MSG_PREHEAT_1                       _UxGT("Berotu PLA")
+#define MSG_PREHEAT_1                       _UxGT("Berotu " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Guztia")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" Amaia")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Ohea")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" Ezarp.")
-#define MSG_PREHEAT_2                       _UxGT("Berotu ABS")
+#define MSG_PREHEAT_2                       _UxGT("Berotu " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_1 _UxGT(" Guztia")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" Amaia")
@@ -92,25 +92,25 @@
 //#define MSG_UBL_MOVING_TO_NEXT            _UxGT("Moving to next")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("UBL aktibatu")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("UBL desaktibatu")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Ohearen tenperatura")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Ohearen tenperatura")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Mutur beroaren tenp.")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Mutur beroaren tenp.")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Sarea editatu")
 //#define MSG_UBL_EDIT_CUSTOM_MESH          _UxGT("Edit Custom Mesh")
 //#define MSG_UBL_FINE_TUNE_MESH            _UxGT("Fine Tuning Mesh")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Sarea editatzea eginda")
-//#define MSG_UBL_BUILD_CUSTOM_MESH         _UxGT("Build Custom Mesh")
+//#define MSG_UBL_BUILD_MESH_CUSTOM         _UxGT("Build Custom Mesh")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Sarea sortu")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("PLA sarea sortu")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT(PREHEAT_1_LABEL " sarea sortu")
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("ABS sarea sortu")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT(PREHEAT_2_LABEL " sarea sortu")
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Sare hotza sortu")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Sarearen altuera doitu")
 //#define MSG_UBL_MESH_HEIGHT_AMOUNT        _UxGT("Height Amount")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Sarea balioetsi")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("PLA sarea balioetsi")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT(PREHEAT_1_LABEL " sarea balioetsi")
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("ABS sarea balioetsi")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT(PREHEAT_2_LABEL " sarea balioetsi")
-//#define MSG_UBL_VALIDATE_CUSTOM_MESH      _UxGT("Validate Custom Mesh")
+//#define MSG_UBL_VALIDATE_MESH_CUSTOM      _UxGT("Validate Custom Mesh")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Ohe sarea balioetsi")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Sare berdinketa")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3 puntuko berdinketa")

Marlin/src/lcd/language/language_fi.h

@@ -47,16 +47,16 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Set home offsets")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsets applied")
 #define MSG_SET_ORIGIN                      _UxGT("Aseta origo")
-#define MSG_PREHEAT_1                       _UxGT("Esilämmitä PLA")
+#define MSG_PREHEAT_1                       _UxGT("Esilämmitä " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Esilämmitä PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Esilämmitä " PREHEAT_1_LABEL " ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Esilä. PLA Kaikki")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Esilä. " PREHEAT_1_LABEL " Kaikki")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Esilä. PLA Alusta")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Esilä. " PREHEAT_1_LABEL " Alusta")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Esilämm. PLA konf")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Esilämm. " PREHEAT_1_LABEL " konf")
-#define MSG_PREHEAT_2                       _UxGT("Esilämmitä ABS")
+#define MSG_PREHEAT_2                       _UxGT("Esilämmitä " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Esilämmitä ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Esilämmitä " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Esilä. ABS Kaikki")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Esilä. " PREHEAT_2_LABEL " Kaikki")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Esilä. ABS Alusta")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Esilä. " PREHEAT_2_LABEL " Alusta")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Esilämm. ABS konf")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Esilämm. " PREHEAT_2_LABEL " konf")
 #define MSG_COOLDOWN                        _UxGT("Jäähdytä")
 #define MSG_SWITCH_PS_ON                    _UxGT("Virta päälle")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Virta pois")

Marlin/src/lcd/language/language_fr.h

@@ -56,18 +56,18 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Régl. décal. origine")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Décalages appliqués")
 #define MSG_SET_ORIGIN                      _UxGT("Régler origine")
-#define MSG_PREHEAT_1                       _UxGT("Préchauffage PLA")
+#define MSG_PREHEAT_1                       _UxGT("Préchauffage " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Préchauff. PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Préchauff. " PREHEAT_1_LABEL " ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Préch. PLA Tout")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Préch. " PREHEAT_1_LABEL " Tout")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" buse")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Préch. PLA lit")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Préch. " PREHEAT_1_LABEL " lit")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Régl. prech. PLA")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Régl. prech. " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_2                       _UxGT("Préchauffage ABS")
+#define MSG_PREHEAT_2                       _UxGT("Préchauffage " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Préchauff. ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Préchauff. " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Préch. ABS Tout")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Préch. " PREHEAT_2_LABEL " Tout")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" buse")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Préch. ABS lit")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Préch. " PREHEAT_2_LABEL " lit")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Régl. prech. ABS")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Régl. prech. " PREHEAT_2_LABEL)
 #define MSG_COOLDOWN                        _UxGT("Refroidir")
 #define MSG_SWITCH_PS_ON                    _UxGT("Allumer alim.")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Eteindre alim.")
@@ -92,25 +92,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Aller au suivant")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Activer l'UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Désactiver l'UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Température lit")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Température lit")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Température buse")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Température buse")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Editer maille")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Editer maille perso")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Réglage fin maille")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Terminer maille")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Créer maille perso")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Créer maille perso")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Créer maille")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Créer maille PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Créer maille " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Créer maille ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Créer maille " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Créer maille froide")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Ajuster haut. maille")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Hauteur")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Valider maille")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Valider maille PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Valider maille " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Valider maille ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Valider maille " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Valider maille perso")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Valider maille perso")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Continuer maille")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Niveau par maille")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("Niveau à 3 points")

Marlin/src/lcd/language/language_gl.h

@@ -52,16 +52,16 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Offsets na orixe")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsets fixados")
 #define MSG_SET_ORIGIN                      _UxGT("Fixar orixe")
-#define MSG_PREHEAT_1                       _UxGT("Prequentar PLA")
+#define MSG_PREHEAT_1                       _UxGT("Prequentar " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Prequentar PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Prequentar " PREHEAT_1_LABEL " ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Preque. PLA Todo")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Preque. " PREHEAT_1_LABEL " Todo")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Preque. PLA Cama")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Preque. " PREHEAT_1_LABEL " Cama")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Preque. PLA conf")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Preque. " PREHEAT_1_LABEL " conf")
-#define MSG_PREHEAT_2                       _UxGT("Prequentar ABS")
+#define MSG_PREHEAT_2                       _UxGT("Prequentar " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Prequentar ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Prequentar " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Preque. ABS Todo")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Preque. " PREHEAT_2_LABEL " Todo")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Preque. ABS Cama")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Preque. " PREHEAT_2_LABEL " Cama")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Preque. ABS conf")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Preque. " PREHEAT_2_LABEL " conf")
 #define MSG_COOLDOWN                        _UxGT("Arrefriar")
 #define MSG_SWITCH_PS_ON                    _UxGT("Acender")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Apagar")

Marlin/src/lcd/language/language_hr.h

@@ -52,12 +52,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Postavi home offsete")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsets postavljeni")
 #define MSG_SET_ORIGIN                      _UxGT("Postavi ishodište")
-#define MSG_PREHEAT_1                       _UxGT("Predgrij PLA")
+#define MSG_PREHEAT_1                       _UxGT("Predgrij " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Sve")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Bed")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" conf")
-#define MSG_PREHEAT_2                       _UxGT("Predgrij ABS")
+#define MSG_PREHEAT_2                       _UxGT("Predgrij " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Sve")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Bed")

Marlin/src/lcd/language/language_it.h

@@ -58,14 +58,14 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Imp. offset home")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offset applicato")
 #define MSG_SET_ORIGIN                      _UxGT("Imposta Origine")
-#define MSG_PREHEAT_1                       _UxGT("Preriscalda PLA")
+#define MSG_PREHEAT_1                       _UxGT("Preriscalda " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Preris.PLA ")
+#define MSG_PREHEAT_1_N                     _UxGT("Preris." PREHEAT_1_LABEL " ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1_N _UxGT("Tutto")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1_N _UxGT("Ugello")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1_N _UxGT("Piatto")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1_N _UxGT("conf")
-#define MSG_PREHEAT_2                       _UxGT("Preriscalda ABS")
+#define MSG_PREHEAT_2                       _UxGT("Preriscalda " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Preris.ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Preris." PREHEAT_2_LABEL " ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2_N _UxGT("Tutto")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2_N _UxGT("Ugello")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2_N _UxGT("Piatto")
@@ -103,25 +103,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Spostamento succes.")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Attiva UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Disattiva UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Temp. Piatto")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Temp. Piatto")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Temp. Ugello")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Temp. Ugello")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Modifica Mesh")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Modif.Mesh personal.")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Ritocca Mesh")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Modif.Mesh fatta")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Crea Mesh personal.")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Crea Mesh personal.")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Crea Mesh")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Crea Mesh PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Crea Mesh " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Crea Mesh ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Crea Mesh " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Crea Mesh a freddo")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Aggiusta Alt. Mesh")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Altezza")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Valida Mesh")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Valida Mesh PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Valida Mesh " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Valida Mesh ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Valida Mesh " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Valida Mesh pers.")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Valida Mesh pers.")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Continua Mesh")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Livell. Mesh")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("Livell. 3 Punti")

Marlin/src/lcd/language/language_jp-kana.h

@@ -60,12 +60,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("キジュンオフセットセッテイ")         // "Set home offsets"
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("オフセットガテキヨウサレマシタ")       // "Offsets applied"
 #define MSG_SET_ORIGIN                      _UxGT("キジュンセット")                 // "Set origin"
-#define MSG_PREHEAT_1                       _UxGT(PREHEAT_1_LABEL " ヨネツ")       // "Preheat PLA"
+#define MSG_PREHEAT_1                       _UxGT(PREHEAT_1_LABEL " ヨネツ")       // "Preheat " PREHEAT_1_LABEL
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   _UxGT(PREHEAT_1_LABEL " スベテヨネツ")  // " All"
 #define MSG_PREHEAT_1_BEDONLY               _UxGT(PREHEAT_1_LABEL " ベッドヨネツ")  // " Bed"
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT("セッテイ")       // " conf"
-#define MSG_PREHEAT_2                       _UxGT(PREHEAT_2_LABEL " ヨネツ")      // "Preheat ABS"
+#define MSG_PREHEAT_2                       _UxGT(PREHEAT_2_LABEL " ヨネツ")      // "Preheat " PREHEAT_2_LABEL
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   _UxGT(PREHEAT_2_LABEL " スベテヨネツ")  // " All"
 #define MSG_PREHEAT_2_BEDONLY               _UxGT(PREHEAT_2_LABEL " ベッドヨネツ")  // " Bed"

Marlin/src/lcd/language/language_ko_KR.h

@@ -58,13 +58,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Set home offsets")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsets applied")
 #define MSG_SET_ORIGIN                      _UxGT("Set origin")
-#define MSG_PREHEAT_1                       _UxGT("예열하기 - PLA")
+#define MSG_PREHEAT_1                       _UxGT("예열하기 - " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" 모두")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" 노즐만")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" 베드만")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" conf")
-#define MSG_PREHEAT_2                       _UxGT("예열하기 - ABS")
+#define MSG_PREHEAT_2                       _UxGT("예열하기 - " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" 모두")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" 노즐만")
@@ -103,25 +103,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Moving to next")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Activate UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Deactivate UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Bed Temp")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Bed Temp")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Hotend Temp")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Hotend Temp")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Mesh Edit")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Edit Custom Mesh")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Fine Tuning Mesh")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Done Editing Mesh")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Build Custom Mesh")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Build Custom Mesh")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Build Mesh")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Build PLA Mesh")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Build Mesh (" PREHEAT_1_LABEL ")")
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Build ABS Mesh")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Build Mesh (" PREHEAT_2_LABEL ")")
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Build Cold Mesh")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Adjust Mesh Height")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Height Amount")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Validate Mesh")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Validate PLA Mesh")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Validate " PREHEAT_1_LABEL " Mesh")
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Validate ABS Mesh")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Validate Mesh (" PREHEAT_2_LABEL ")")
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Validate Custom Mesh")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Validate Custom Mesh")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Continue Bed Mesh")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Mesh Leveling")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3-Point Leveling")

Marlin/src/lcd/language/language_nl.h

@@ -55,18 +55,18 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Zet home offsets")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("H offset toegep.")
 #define MSG_SET_ORIGIN                      _UxGT("Nulpunt instellen")
-#define MSG_PREHEAT_1                       _UxGT("PLA voorverwarmen")
+#define MSG_PREHEAT_1                       _UxGT(PREHEAT_1_LABEL " voorverwarmen")
-#define MSG_PREHEAT_1_N                     _UxGT("PLA voorverw. ")
+#define MSG_PREHEAT_1_N                     _UxGT(PREHEAT_1_LABEL " voorverw. ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1_N _UxGT("aan")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" Einde")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1_N _UxGT("Bed")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("PLA verw. conf")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT(PREHEAT_1_LABEL " verw. conf")
-#define MSG_PREHEAT_2                       _UxGT("ABS voorverwarmen")
+#define MSG_PREHEAT_2                       _UxGT(PREHEAT_2_LABEL " voorverwarmen")
-#define MSG_PREHEAT_2_N                     _UxGT("ABS voorverw. ")
+#define MSG_PREHEAT_2_N                     _UxGT(PREHEAT_2_LABEL " voorverw. ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2_N _UxGT("aan")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" Einde")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2_N _UxGT("Bed")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("ABS verw. conf")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT(PREHEAT_2_LABEL " verw. conf")
 #define MSG_COOLDOWN                        _UxGT("Afkoelen")
 #define MSG_SWITCH_PS_ON                    _UxGT("Stroom aan")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Stroom uit")

Marlin/src/lcd/language/language_pl.h

@@ -52,16 +52,16 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ust. poz. zer.")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Poz. zerowa ust.")
 #define MSG_SET_ORIGIN                      _UxGT("Ustaw punkt zero")
-#define MSG_PREHEAT_1                       _UxGT("Rozgrzej PLA")
+#define MSG_PREHEAT_1                       _UxGT("Rozgrzej " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" wsz.")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Rozgrzej stół PLA")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Rozgrzej stół " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Ustaw. rozg. PLA")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Ustaw. rozg. " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_2                       _UxGT("Rozgrzej ABS")
+#define MSG_PREHEAT_2                       _UxGT("Rozgrzej " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" wsz.")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Rozgrzej stół ABS")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Rozgrzej stół " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Ustaw. rozg. ABS")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Ustaw. rozg. " PREHEAT_2_LABEL)
 #define MSG_COOLDOWN                        _UxGT("Chłodzenie")
 #define MSG_SWITCH_PS_ON                    _UxGT("Włącz zasilacz")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Wyłącz zasilacz")

Marlin/src/lcd/language/language_pt-br.h

@@ -60,18 +60,18 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Compensar origem")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Alteração feita")
 #define MSG_SET_ORIGIN                      _UxGT("Ajustar Origem")
-#define MSG_PREHEAT_1                       _UxGT("Pre-aquecer PLA")
+#define MSG_PREHEAT_1                       _UxGT("Pre-aquecer " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
-#define MSG_PREHEAT_1_ALL                   _UxGT("Pre-aq.Todo PLA")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Pre-aq.Todo " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_END                   _UxGT("Pre-aq.Extrusora")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Pre-aq.Mesa PLA")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Pre-aq.Mesa " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Ajustar PLA")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Ajustar " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_2                       _UxGT("Pre-aquecer ABS")
+#define MSG_PREHEAT_2                       _UxGT("Pre-aquecer " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Pre-aquecer ABS")
+#define MSG_PREHEAT_2_N                     _UxGT("Pre-aquecer " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_ALL                   _UxGT("Pre-aq.Todo ABS")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Pre-aq.Todo " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Pre-aq.Mesa ABS")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Pre-aq.Mesa " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_END                   _UxGT("Pre-aq.Extrusora")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Ajustar ABS")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Ajustar " PREHEAT_2_LABEL)
 #define MSG_COOLDOWN                        _UxGT("Esfriar")
 #define MSG_SWITCH_PS_ON                    _UxGT("Ligar")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Desligar")
@@ -97,25 +97,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Indo para o Próximo")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Ativar UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Desativar UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Temp. Mesa")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Temp. Mesa")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Temp. Extrusora")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Temp. Extrusora")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Editar Malha")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Editar Malha Custom")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Ajuste Fino da Malha")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Fim da Edição")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Montar Customi")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Montar Customi")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Montar ")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Montar PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Montar " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Montar ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Montar " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Montar fria")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Ajustar Altura")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Tamanho da Elevação")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Validar Malha")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Checar PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Checar " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Checar ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Checar " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Validar Malha Custom")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Validar Malha Custom")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Continuar Malha")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Nivelação da Malha")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("Nivelação 3 pontos")

Marlin/src/lcd/language/language_pt.h

@@ -52,16 +52,16 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Definir desvio")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsets aplicados")
 #define MSG_SET_ORIGIN                      _UxGT("Definir origem")
-#define MSG_PREHEAT_1                       _UxGT("Pre-aquecer PLA")
+#define MSG_PREHEAT_1                       _UxGT("Pre-aquecer " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_N                     _UxGT("Pre-aquecer PLA")
+#define MSG_PREHEAT_1_N                     _UxGT("Pre-aquecer " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_1_ALL                   _UxGT("Pre-aq. PLA Tudo")
+#define MSG_PREHEAT_1_ALL                   _UxGT("Pre-aq. " PREHEAT_1_LABEL " Tudo")
-#define MSG_PREHEAT_1_BEDONLY               _UxGT("Pre-aq. PLA ") LCD_STR_THERMOMETER _UxGT("Base")
+#define MSG_PREHEAT_1_BEDONLY               _UxGT("Pre-aq. " PREHEAT_1_LABEL " ") LCD_STR_THERMOMETER _UxGT("Base")
-#define MSG_PREHEAT_1_SETTINGS              _UxGT("Definições PLA")
+#define MSG_PREHEAT_1_SETTINGS              _UxGT("Definições " PREHEAT_1_LABEL)
-#define MSG_PREHEAT_2                       _UxGT("Pre-aquecer ABS")
+#define MSG_PREHEAT_2                       _UxGT("Pre-aquecer " PREHEAT_2_LABEL)
-#define MSG_PREHEAT_2_N                     _UxGT("Pre-aquecer ABS ")
+#define MSG_PREHEAT_2_N                     _UxGT("Pre-aquecer " PREHEAT_2_LABEL " ")
-#define MSG_PREHEAT_2_ALL                   _UxGT("Pre-aq. ABS Tudo")
+#define MSG_PREHEAT_2_ALL                   _UxGT("Pre-aq. " PREHEAT_2_LABEL " Tudo")
-#define MSG_PREHEAT_2_BEDONLY               _UxGT("Pre-aq. ABS ") LCD_STR_THERMOMETER _UxGT("Base")
+#define MSG_PREHEAT_2_BEDONLY               _UxGT("Pre-aq. " PREHEAT_2_LABEL " ") LCD_STR_THERMOMETER _UxGT("Base")
-#define MSG_PREHEAT_2_SETTINGS              _UxGT("Definições ABS")
+#define MSG_PREHEAT_2_SETTINGS              _UxGT("Definições " PREHEAT_2_LABEL)
 #define MSG_COOLDOWN                        _UxGT("Arrefecer")
 #define MSG_SWITCH_PS_ON                    _UxGT("Ligar")
 #define MSG_SWITCH_PS_OFF                   _UxGT("Desligar")

Marlin/src/lcd/language/language_ru.h

@@ -57,13 +57,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Запомнить парковку")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Коррекции применены")
 #define MSG_SET_ORIGIN                      _UxGT("Запомнить ноль")
-#define MSG_PREHEAT_1                       _UxGT("Преднагрев PLA")
+#define MSG_PREHEAT_1                       _UxGT("Преднагрев " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" всё")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" сопло")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" стол")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" настр.")
-#define MSG_PREHEAT_2                       _UxGT("Преднагрев ABS")
+#define MSG_PREHEAT_2                       _UxGT("Преднагрев " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" всё")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" сопло")
@@ -93,25 +93,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Двигаемся дальше")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Активировать UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Деактивировать UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Температура стола")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Температура стола")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Температура сопла")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Температура сопла")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Редактор сеток")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Редакт. свою сетку")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Точная настр. сетки")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Ред. сетки завершено")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Построить свою сетку")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Построить свою сетку")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Построить сетку")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Построить сетку PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Построить сетку " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Построить сетку ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Построить сетку " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Построить хол. сетку")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Устан. высоту сетки")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Высота")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Проверить сетку")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Проверить сетку PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Проверить сетку " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Проверить сетку ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Проверить сетку " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Проверить свою сетку")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Проверить свою сетку")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Продолжить сетку")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Калибровка сетки")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("Калибровка 3-х точек")

Marlin/src/lcd/language/language_sk.h

@@ -69,13 +69,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Nastaviť offsety")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offsety nastavené")
 #define MSG_SET_ORIGIN                      _UxGT("Nastaviť začiatok")
-#define MSG_PREHEAT_1                       _UxGT("Zahriať PLA")
+#define MSG_PREHEAT_1                       _UxGT("Zahriať " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" všetko")
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" hotend")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" podlož")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" nast.")
-#define MSG_PREHEAT_2                       _UxGT("Zahriať ABS")
+#define MSG_PREHEAT_2                       _UxGT("Zahriať " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" všetko")
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" hotend")
@@ -115,25 +115,25 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("Presun na ďalší")
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("Aktivovať UBL")
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("Deaktivovať UBL")
-#define MSG_UBL_SET_BED_TEMP                _UxGT("Teplota podložky")
+#define MSG_UBL_SET_TEMP_BED                _UxGT("Teplota podložky")
-#define MSG_UBL_CUSTOM_BED_TEMP             MSG_UBL_SET_BED_TEMP
+#define MSG_UBL_BED_TEMP_CUSTOM             MSG_UBL_SET_TEMP_BED
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("Teplota hotendu")
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("Teplota hotendu")
-#define MSG_UBL_CUSTOM_HOTEND_TEMP          MSG_UBL_SET_HOTEND_TEMP
+#define MSG_UBL_HOTEND_TEMP_CUSTOM          MSG_UBL_SET_TEMP_HOTEND
 #define MSG_UBL_MESH_EDIT                   _UxGT("Úprava siete bodov")
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("Upraviť vlastnú sieť")
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("Doladiť sieť bodov")
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("Koniec úprav siete")
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("Vlastná sieť")
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("Vlastná sieť")
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("Vytvoriť sieť")
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("Sieť bodov PLA")
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("Sieť bodov " PREHEAT_1_LABEL)
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("Sieť bodov ABS")
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("Sieť bodov " PREHEAT_2_LABEL)
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("Studená sieť bodov")
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("Upraviť výšku siete")
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("Výška")
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("Skontrolovať sieť")
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("Kontrola siete PLA")
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("Kontrola siete " PREHEAT_1_LABEL)
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("Kontrola siete ABS")
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("Kontrola siete " PREHEAT_2_LABEL)
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("Kontrola vlast.siete")
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("Kontrola vlast.siete")
 #define MSG_UBL_CONTINUE_MESH               _UxGT("Pokračovať v sieti")
 #define MSG_UBL_MESH_LEVELING               _UxGT("Sieťové rovnanie")
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("3-bodové rovnanie")

Marlin/src/lcd/language/language_tr.h

@@ -55,13 +55,13 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Offset Ayarla")                                      // Offset Ayarla
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Offset Tamam")                                       // Offset Tamam
 #define MSG_SET_ORIGIN                      _UxGT("Sıfır Belirle")                                      // Sıfır Belirle
-#define MSG_PREHEAT_1                       _UxGT("Ön Isınma PLA")                                      // Ön Isınma PLA
+#define MSG_PREHEAT_1                       _UxGT("Ön Isınma " PREHEAT_1_LABEL)                         // Ön Isınma PREHEAT_1_LABEL
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")                                    //
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Tüm")                                 //  Tüm
 #define MSG_PREHEAT_1_END                   MSG_PREHEAT_1 _UxGT(" Nozül")                               //  Nozül
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Tabla")                               //  Tabla
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" Ayar")                                //  Ayar
-#define MSG_PREHEAT_2                       _UxGT("Ön Isınma ABS")                                      // Ön Isınma ABS
+#define MSG_PREHEAT_2                       _UxGT("Ön Isınma " PREHEAT_2_LABEL)                         // Ön Isınma PREHEAT_2_LABEL
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")                                    //
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Tüm")                                 //  Tüm
 #define MSG_PREHEAT_2_END                   MSG_PREHEAT_2 _UxGT(" Nozül")                               //  Nozül

Marlin/src/lcd/language/language_uk.h

@@ -52,12 +52,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("Зберегти паркув.")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Зміщення застос.")
 #define MSG_SET_ORIGIN                      _UxGT("Встанов. початок")
-#define MSG_PREHEAT_1                       _UxGT("Нагрів PLA")
+#define MSG_PREHEAT_1                       _UxGT("Нагрів " PREHEAT_1_LABEL)
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" Все")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" Стіл")
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" нал.")
-#define MSG_PREHEAT_2                       _UxGT("Нагрів ABS")
+#define MSG_PREHEAT_2                       _UxGT("Нагрів " PREHEAT_2_LABEL)
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" Все")
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" Стіл")

Marlin/src/lcd/language/language_zh_CN.h

@@ -57,12 +57,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("设置原点偏移")  //"Set home offsets"
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("偏移已启用")  //"Offsets applied"
 #define MSG_SET_ORIGIN                      _UxGT("设置原点")  //"Set origin"
-#define MSG_PREHEAT_1                       _UxGT("预热" PREHEAT_1_LABEL)  //"Preheat PLA"
+#define MSG_PREHEAT_1                       _UxGT("预热" PREHEAT_1_LABEL)  //"Preheat PREHEAT_2_LABEL"
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")  //MSG_PREHEAT_1 " "
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" 全部")  //MSG_PREHEAT_1 " All"
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" 热床")  //MSG_PREHEAT_1 " Bed"
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" 设置")  //MSG_PREHEAT_1 " conf"
-#define MSG_PREHEAT_2                       _UxGT("预热" PREHEAT_2_LABEL)  //"Preheat ABS"
+#define MSG_PREHEAT_2                       _UxGT("预热" PREHEAT_2_LABEL)  //"Preheat PREHEAT_2_LABEL"
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")  //MSG_PREHEAT_2 " "
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" 全部")  //MSG_PREHEAT_2 " All"
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" 热床")  //MSG_PREHEAT_2 " Bed"
@@ -93,23 +93,23 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("移动到下一个") // "Moving to next"
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("激活UBL") // "Activate UBL"
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("关闭UBL") // "Deactivate UBL"
-#define MSG_UBL_SET_BED_TEMP                _UxGT("设置热床温度") // "Bed Temp"
+#define MSG_UBL_SET_TEMP_BED                _UxGT("设置热床温度") // "Bed Temp"
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("热端温度") // "Hotend Temp"
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("热端温度") // "Hotend Temp"
 #define MSG_UBL_MESH_EDIT                   _UxGT("网格编辑") // "Mesh Edit"
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("编辑客户网格") // "Edit Custom Mesh"
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("细调网格") // "Fine Tuning Mesh"
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("完成编辑网格") // "Done Editing Mesh"
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("创设客户网格") // "Build Custom Mesh"
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("创设客户网格") // "Build Custom Mesh"
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("创设网格") // "Build Mesh"
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("创设PLA网格") // "Build PLA Mesh"
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("创设" PREHEAT_1_LABEL "网格") // "Build PREHEAT_1_LABEL Mesh"
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("创设ABS网格") // "Build ABS Mesh"
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("创设" PREHEAT_2_LABEL "网格") // "Build PREHEAT_2_LABEL Mesh"
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("创设冷网格") // "Build Cold Mesh"
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("调整网格高度") // "Adjust Mesh Height"
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("高度合计") // "Height Amount"
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("批准网格") // "Validate Mesh"
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("批准PLA网格") // "Validate PLA Mesh"
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("批准" PREHEAT_1_LABEL "网格") // "Validate PREHEAT_1_LABEL Mesh"
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("批准ABS网格") // "Validate ABS Mesh"
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("批准" PREHEAT_2_LABEL "网格") // "Validate PREHEAT_2_LABEL Mesh"
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("批准客户网格") // "Validate Custom Mesh"
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("批准客户网格") // "Validate Custom Mesh"
 #define MSG_UBL_CONTINUE_MESH               _UxGT("继续热床网格") // "Continue Bed Mesh"
 #define MSG_UBL_MESH_LEVELING               _UxGT("网格调平") // "Mesh Leveling"
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("三点调平") // "3-Point Leveling"

Marlin/src/lcd/language/language_zh_TW.h

@@ -57,12 +57,12 @@
 #define MSG_SET_HOME_OFFSETS                _UxGT("設置原點偏移")  //"Set home offsets"
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("偏移已啟用")  //"Offsets applied"
 #define MSG_SET_ORIGIN                      _UxGT("設置原點")  //"Set origin"
-#define MSG_PREHEAT_1                       _UxGT("預熱PLA")  //"Preheat PLA"
+#define MSG_PREHEAT_1                       _UxGT("預熱" PREHEAT_1_LABEL)  //"Preheat PREHEAT_1_LABEL"
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")  //MSG_PREHEAT_1 " "
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" 全部")  //MSG_PREHEAT_1 " All"
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" 熱床")  //MSG_PREHEAT_1 " Bed"
 #define MSG_PREHEAT_1_SETTINGS              MSG_PREHEAT_1 _UxGT(" 設置")  //MSG_PREHEAT_1 " conf"
-#define MSG_PREHEAT_2                       _UxGT("預熱ABS")  //"Preheat ABS"
+#define MSG_PREHEAT_2                       _UxGT("預熱" PREHEAT_2_LABEL)  //"Preheat PREHEAT_2_LABEL"
 #define MSG_PREHEAT_2_N                     MSG_PREHEAT_2 _UxGT(" ")  //MSG_PREHEAT_2 " "
 #define MSG_PREHEAT_2_ALL                   MSG_PREHEAT_2 _UxGT(" 全部")  //MSG_PREHEAT_2 " All"
 #define MSG_PREHEAT_2_BEDONLY               MSG_PREHEAT_2 _UxGT(" 熱床")  //MSG_PREHEAT_2 " Bed"
@@ -93,23 +93,23 @@
 #define MSG_UBL_MOVING_TO_NEXT              _UxGT("移動到下一個") // "Moving to next"
 #define MSG_UBL_ACTIVATE_MESH               _UxGT("激活UBL") // "Activate UBL"
 #define MSG_UBL_DEACTIVATE_MESH             _UxGT("關閉UBL") // "Deactivate UBL"
-#define MSG_UBL_SET_BED_TEMP                _UxGT("設置熱床溫度") // "Bed Temp"
+#define MSG_UBL_SET_TEMP_BED                _UxGT("設置熱床溫度") // "Bed Temp"
-#define MSG_UBL_SET_HOTEND_TEMP             _UxGT("熱端溫度") // "Hotend Temp"
+#define MSG_UBL_SET_TEMP_HOTEND             _UxGT("熱端溫度") // "Hotend Temp"
 #define MSG_UBL_MESH_EDIT                   _UxGT("網格編輯") // "Mesh Edit"
 #define MSG_UBL_EDIT_CUSTOM_MESH            _UxGT("編輯客戶網格") // "Edit Custom Mesh"
 #define MSG_UBL_FINE_TUNE_MESH              _UxGT("細調網格") // "Fine Tuning Mesh"
 #define MSG_UBL_DONE_EDITING_MESH           _UxGT("完成編輯網格") // "Done Editing Mesh"
-#define MSG_UBL_BUILD_CUSTOM_MESH           _UxGT("創設客戶網格") // "Build Custom Mesh"
+#define MSG_UBL_BUILD_MESH_CUSTOM           _UxGT("創設客戶網格") // "Build Custom Mesh"
 #define MSG_UBL_BUILD_MESH_MENU             _UxGT("創設網格") // "Build Mesh"
-#define MSG_UBL_BUILD_PLA_MESH              _UxGT("創設PLA網格") // "Build PLA Mesh"
+#define MSG_UBL_BUILD_MESH_M1               _UxGT("創設" PREHEAT_1_LABEL "網格") // "Build PREHEAT_1_LABEL Mesh"
-#define MSG_UBL_BUILD_ABS_MESH              _UxGT("創設ABS網格") // "Build ABS Mesh"
+#define MSG_UBL_BUILD_MESH_M2               _UxGT("創設" PREHEAT_2_LABEL "網格") // "Build PREHEAT_2_LABEL Mesh"
 #define MSG_UBL_BUILD_COLD_MESH             _UxGT("創設冷網格") // "Build Cold Mesh"
 #define MSG_UBL_MESH_HEIGHT_ADJUST          _UxGT("調整網格高度") // "Adjust Mesh Height"
 #define MSG_UBL_MESH_HEIGHT_AMOUNT          _UxGT("高度合計") // "Height Amount"
 #define MSG_UBL_VALIDATE_MESH_MENU          _UxGT("批准網格") // "Validate Mesh"
-#define MSG_UBL_VALIDATE_PLA_MESH           _UxGT("批准PLA網格") // "Validate PLA Mesh"
+#define MSG_UBL_VALIDATE_MESH_M1            _UxGT("批准" PREHEAT_1_LABEL "網格") // "Validate PREHEAT_1_LABEL Mesh"
-#define MSG_UBL_VALIDATE_ABS_MESH           _UxGT("批准ABS網格") // "Validate ABS Mesh"
+#define MSG_UBL_VALIDATE_MESH_M2            _UxGT("批准" PREHEAT_2_LABEL "網格") // "Validate PREHEAT_2_LABEL Mesh"
-#define MSG_UBL_VALIDATE_CUSTOM_MESH        _UxGT("批准客戶網格") // "Validate Custom Mesh"
+#define MSG_UBL_VALIDATE_MESH_CUSTOM        _UxGT("批准客戶網格") // "Validate Custom Mesh"
 #define MSG_UBL_CONTINUE_MESH               _UxGT("繼續熱床網格") // "Continue Bed Mesh"
 #define MSG_UBL_MESH_LEVELING               _UxGT("網格調平") // "Mesh Leveling"
 #define MSG_UBL_3POINT_MESH_LEVELING        _UxGT("三點調平") // "3-Point Leveling"

Marlin/src/lcd/ultralcd.cpp

@@ -2226,11 +2226,11 @@ void lcd_quick_feedback(const bool clear_buttons) {
     void _lcd_ubl_custom_mesh() {
       START_MENU();
       MENU_BACK(MSG_UBL_BUILD_MESH_MENU);
-      MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_HOTEND_TEMP, &custom_hotend_temp, EXTRUDE_MINTEMP, (HEATER_0_MAXTEMP - 10));
+      MENU_ITEM_EDIT(int3, MSG_UBL_HOTEND_TEMP_CUSTOM, &custom_hotend_temp, EXTRUDE_MINTEMP, (HEATER_0_MAXTEMP - 10));
       #if HAS_HEATED_BED
-        MENU_ITEM_EDIT(int3, MSG_UBL_CUSTOM_BED_TEMP, &custom_bed_temp, BED_MINTEMP, (BED_MAXTEMP - 15));
+        MENU_ITEM_EDIT(int3, MSG_UBL_BED_TEMP_CUSTOM, &custom_bed_temp, BED_MINTEMP, (BED_MAXTEMP - 15));
       #endif
-      MENU_ITEM(function, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_build_custom_mesh);
+      MENU_ITEM(function, MSG_UBL_BUILD_MESH_CUSTOM, _lcd_ubl_build_custom_mesh);
       END_MENU();
     }
 
@@ -2301,8 +2301,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
      * UBL Validate Mesh submenu
      *
      * << UBL Tools
-     *    PLA Mesh Validation
+     *    Mesh Validation with Material 1
-     *    ABS Mesh Validation
+     *    Mesh Validation with Material 2
      *    Validate Custom Mesh
      * << Info Screen
      */
@@ -2310,13 +2310,13 @@ void lcd_quick_feedback(const bool clear_buttons) {
       START_MENU();
       MENU_BACK(MSG_UBL_TOOLS);
       #if HAS_HEATED_BED
-        MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
+        MENU_ITEM(gcode, MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_1_TEMP_BED) " H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
-        MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
+        MENU_ITEM(gcode, MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B" STRINGIFY(PREHEAT_2_TEMP_BED) " H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
       #else
-        MENU_ITEM(gcode, MSG_UBL_VALIDATE_PLA_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
+        MENU_ITEM(gcode, MSG_UBL_VALIDATE_MESH_M1, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_1_TEMP_HOTEND) " P"));
-        MENU_ITEM(gcode, MSG_UBL_VALIDATE_ABS_MESH, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
+        MENU_ITEM(gcode, MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
       #endif
-      MENU_ITEM(function, MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
+      MENU_ITEM(function, MSG_UBL_VALIDATE_MESH_CUSTOM, _lcd_ubl_validate_custom_mesh);
       MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
       END_MENU();
     }
@@ -2400,8 +2400,8 @@ void lcd_quick_feedback(const bool clear_buttons) {
      * UBL Build Mesh submenu
      *
      * << UBL Tools
-     *    Build PLA Mesh
+     *    Build Mesh with Material 1
-     *    Build ABS Mesh
+     *    Build Mesh with Material 2
      *  - Build Custom Mesh >>
      *    Build Cold Mesh
      *  - Fill-in Mesh >>
@@ -2414,7 +2414,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
       START_MENU();
       MENU_BACK(MSG_UBL_TOOLS);
       #if HAS_HEATED_BED
-        MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR(
+        MENU_ITEM(gcode, MSG_UBL_BUILD_MESH_M1, PSTR(
           "G28\n"
           "M190 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\n"
           "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
@@ -2422,7 +2422,7 @@ void lcd_quick_feedback(const bool clear_buttons) {
           "M104 S0\n"
           "M140 S0"
         ));
-        MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR(
+        MENU_ITEM(gcode, MSG_UBL_BUILD_MESH_M2, PSTR(
           "G28\n"
           "M190 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\n"
           "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
@@ -2431,20 +2431,20 @@ void lcd_quick_feedback(const bool clear_buttons) {
           "M140 S0"
         ));
       #else
-        MENU_ITEM(gcode, MSG_UBL_BUILD_PLA_MESH, PSTR(
+        MENU_ITEM(gcode, MSG_UBL_BUILD_MESH_M1, PSTR(
           "G28\n"
           "M109 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) "\n"
           "G29 P1\n"
           "M104 S0"
         ));
-        MENU_ITEM(gcode, MSG_UBL_BUILD_ABS_MESH, PSTR(
+        MENU_ITEM(gcode, MSG_UBL_BUILD_MESH_M2, PSTR(
           "G28\n"
           "M109 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) "\n"
           "G29 P1\n"
           "M104 S0"
         ));
       #endif
-      MENU_ITEM(submenu, MSG_UBL_BUILD_CUSTOM_MESH, _lcd_ubl_custom_mesh);
+      MENU_ITEM(submenu, MSG_UBL_BUILD_MESH_CUSTOM, _lcd_ubl_custom_mesh);
       MENU_ITEM(gcode, MSG_UBL_BUILD_COLD_MESH, PSTR("G28\nG29 P1"));
       MENU_ITEM(submenu, MSG_UBL_FILLIN_MESH, _lcd_ubl_fillin_menu);
       MENU_ITEM(gcode, MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));