@leptun strip 1st char hack for duplicate `Cancel`

Firmware/messages.c

@@ -17,7 +17,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=20
 const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
-const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9
+const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////c=9
 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=18
 const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20

Firmware/ultralcd.cpp

@@ -2209,7 +2209,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
 
             lcd_clear();
             lcd_draw_update = 1;
-            lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_CANCEL2 c=10
+            lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
 
             lcd_set_cursor(0, 1);
             switch (eFilamentAction)
@@ -2237,7 +2237,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
                 // handled earlier
                 break;
             }
-            lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
+            lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
         }
 
         lcd_set_cursor(0, 0);
@@ -4626,7 +4626,7 @@ void lcd_v2_calibration()
 	{
 	    const uint8_t filament = choose_menu_P(
             _i("Select filament:"), ////MSG_SELECT_FILAMENT c=20
-            _T(MSG_FILAMENT),_T(MSG_CANCEL));
+            _T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
 	    if (filament < 5)
 	    {
 	        lay1cal_filament = filament;

lang/lang_en.txt

@@ -133,9 +133,6 @@
 #MSG_MENU_CALIBRATION c=18
 "Calibration"
 
-#MSG_CANCEL c=9
-"Cancel"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 

lang/lang_en_cz.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Kalibrace"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Zrusit"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "Karta vyjmuta"

lang/lang_en_de.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Kalibrierung"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Abbruch"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "SD Karte entfernt"

lang/lang_en_es.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Calibracion"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Cancelar"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "Tarjeta retirada"

lang/lang_en_fr.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "\x00"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Annuler"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "Carte retiree"

lang/lang_en_it.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Calibrazione"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Annulla"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "SD rimossa"

lang/lang_en_nl.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Kalibratie"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Annuleren"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "SD verwijderd"

lang/lang_en_pl.txt

@@ -178,10 +178,6 @@
 "Calibration"
 "Kalibracja"
 
-#MSG_CANCEL c=9
-"Cancel"
-"Anuluj"
-
 #MSG_SD_REMOVED c=20
 "Card removed"
 "Karta wyjeta"