Browse Source

Rename some "kill" messages

Scott Lahteine 4 years ago
parent
commit
22da1b2b31

+ 1
- 1
Marlin/src/feature/mmu2/mmu2.cpp View File

@@ -433,7 +433,7 @@ bool MMU2::rx_ok() {
433 433
 void MMU2::check_version() {
434 434
   if (buildnr < MMU_REQUIRED_FW_BUILDNR) {
435 435
     SERIAL_ERROR_MSG("Invalid MMU2 firmware. Version >= " STRINGIFY(MMU_REQUIRED_FW_BUILDNR) " required.");
436
-    kill(GET_TEXT(MSG_MMU2_WRONG_FIRMWARE));
436
+    kill(GET_TEXT(MSG_KILL_MMU2_FIRMWARE));
437 437
   }
438 438
 }
439 439
 

+ 1
- 1
Marlin/src/gcode/host/M16.cpp View File

@@ -33,7 +33,7 @@
33 33
 void GcodeSuite::M16() {
34 34
 
35 35
   if (strcmp_P(parser.string_arg, PSTR(MACHINE_NAME)))
36
-    kill(GET_TEXT(MSG_EXPECTED_PRINTER));
36
+    kill(GET_TEXT(MSG_KILL_EXPECTED_PRINTER));
37 37
 
38 38
 }
39 39
 

+ 1
- 1
Marlin/src/lcd/language/language_bg.h View File

@@ -149,5 +149,5 @@ namespace Language_bg {
149 149
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Y               = _UxGT("Калибровка Y");
150 150
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Калибровка Z");
151 151
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Калибровка Център");
152
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Неправилен принтер");
152
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неправилен принтер");
153 153
 }

+ 1
- 1
Marlin/src/lcd/language/language_ca.h View File

@@ -211,7 +211,7 @@ namespace Language_ca {
211 211
   PROGMEM Language_Str MSG_DAC_EEPROM_WRITE                = _UxGT("DAC EEPROM Write");
212 212
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Repren impressió");
213 213
 
214
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Impressora incorrecta");
214
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora incorrecta");
215 215
 
216 216
   //
217 217
   // Filament Change screens show up to 3 lines on a 4-line display

+ 3
- 3
Marlin/src/lcd/language/language_cz.h View File

@@ -464,7 +464,7 @@ namespace Language_cz {
464 464
 
465 465
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvětlení");
466 466
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jas světla");
467
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("NESPRÁVNÁ TISKÁRNA");
467
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("NESPRÁVNÁ TISKÁRNA");
468 468
 
469 469
   #if LCD_WIDTH >= 20
470 470
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Počet tisků");
@@ -500,13 +500,13 @@ namespace Language_cz {
500 500
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
501 501
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
502 502
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Délka mm senz.fil.");
503
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Parkování selhalo");
503
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkování selhalo");
504 504
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrace selhala");
505 505
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Moc studený");
506 506
 
507 507
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("VYBERTE FILAMENT");
508 508
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
509
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Aktual. MMU firmware!");
509
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Aktual. MMU firmware!");
510 510
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU potř. pozornost.");
511 511
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Obnovit tisk");
512 512
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Obnovování...");

+ 1
- 1
Marlin/src/lcd/language/language_da.h View File

@@ -185,7 +185,7 @@ namespace Language_da {
185 185
 
186 186
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Forsæt print");
187 187
 
188
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Forkert printer");
188
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Forkert printer");
189 189
 
190 190
   #if LCD_HEIGHT >= 4
191 191
     PROGMEM Language_Str MSG_FILAMENT_CHANGE_INIT          = _UxGT(MSG_3_LINE("Vent på start", "af filament", "skift"));

+ 3
- 3
Marlin/src/lcd/language/language_de.h View File

@@ -433,7 +433,7 @@ namespace Language_de {
433 433
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Beleuchtung");
434 434
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Helligkeit");
435 435
 
436
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Falscher Drucker");
436
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Falscher Drucker");
437 437
 
438 438
   #if LCD_WIDTH >= 20
439 439
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Gesamte Drucke");
@@ -469,13 +469,13 @@ namespace Language_de {
469 469
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Düse: ");
470 470
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout-Sensor");
471 471
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Runout-Weg mm");
472
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Homing gescheitert");
472
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing gescheitert");
473 473
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing gescheitert");
474 474
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: zu kalt");
475 475
 
476 476
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMENT WÄHLEN");
477 477
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
478
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Update MMU Firmware!");
478
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
479 479
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU handeln erfor.");
480 480
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Druck fortsetzen");
481 481
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Fortfahren...");

+ 1
- 1
Marlin/src/lcd/language/language_el.h View File

@@ -188,5 +188,5 @@ namespace Language_el {
188 188
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Βαθμονόμηση Z");
189 189
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Βαθμονόμηση κέντρου");
190 190
 
191
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Εσφαλμένος εκτυπωτής");
191
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Εσφαλμένος εκτυπωτής");
192 192
 }

+ 1
- 1
Marlin/src/lcd/language/language_el_gr.h View File

@@ -189,5 +189,5 @@ namespace Language_el_gr {
189 189
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Βαθμονόμηση Z");
190 190
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Βαθμονόμηση κέντρου");
191 191
 
192
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Εσφαλμένος εκτυπωτής");
192
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Εσφαλμένος εκτυπωτής");
193 193
 }

+ 3
- 3
Marlin/src/lcd/language/language_en.h View File

@@ -473,7 +473,7 @@ namespace Language_en {
473 473
 
474 474
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Case Light");
475 475
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Light Brightness");
476
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("INCORRECT PRINTER");
476
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("INCORRECT PRINTER");
477 477
 
478 478
   #if LCD_WIDTH >= 20
479 479
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Print Count");
@@ -509,13 +509,13 @@ namespace Language_en {
509 509
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Nozzle: ");
510 510
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout Sensor");
511 511
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Runout Dist mm");
512
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Homing Failed");
512
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Homing Failed");
513 513
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Failed");
514 514
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Too Cold");
515 515
 
516 516
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
517 517
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
518
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Update MMU Firmware!");
518
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
519 519
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
520 520
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Resume Print");
521 521
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resuming...");

+ 3
- 3
Marlin/src/lcd/language/language_es.h View File

@@ -467,7 +467,7 @@ namespace Language_es {
467 467
 
468 468
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz cabina");
469 469
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Brillo cabina");
470
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Impresora incorrecta");
470
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impresora incorrecta");
471 471
 
472 472
   #if LCD_WIDTH >= 20
473 473
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Cont. de impresión");
@@ -503,13 +503,13 @@ namespace Language_es {
503 503
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Boquilla: ");
504 504
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sens. filamento");
505 505
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist. filamento mm");
506
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Ir a origen Fallado");
506
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Ir a origen Fallado");
507 507
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondeo Fallado");
508 508
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Muy Frio");
509 509
 
510 510
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ELIJE FILAMENTO");
511 511
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
512
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("¡Actu. MMU Firmware!");
512
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("¡Actu. MMU Firmware!");
513 513
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Necesita Cuidado");
514 514
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Continuar imp.");
515 515
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resumiendo...");

+ 2
- 2
Marlin/src/lcd/language/language_eu.h View File

@@ -306,11 +306,11 @@ namespace Language_eu {
306 306
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_HEADER   = _UxGT("ALDAKETA AUKERAK:");
307 307
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Inprima. jarraitu");
308 308
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Pita: ");
309
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Hasi. huts egin du");
309
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Hasi. huts egin du");
310 310
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Neurketak huts egin du");
311 311
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: hotzegi");
312 312
 
313
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Inprimagailu okerra");
313
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Inprimagailu okerra");
314 314
 
315 315
   //
316 316
   // Filament Change screens show up to 3 lines on a 4-line display

+ 1
- 1
Marlin/src/lcd/language/language_fi.h View File

@@ -124,5 +124,5 @@ namespace Language_fi {
124 124
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_Z               = _UxGT("Kalibroi Z");
125 125
   PROGMEM Language_Str MSG_DELTA_CALIBRATE_CENTER          = _UxGT("Kalibroi Center");
126 126
 
127
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Väärä tulostin");
127
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Väärä tulostin");
128 128
 }

+ 2
- 2
Marlin/src/lcd/language/language_fr.h View File

@@ -422,7 +422,7 @@ namespace Language_fr {
422 422
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Lumière caisson");
423 423
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Luminosité");
424 424
 
425
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Imprimante incorrecte");
425
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Imprimante incorrecte");
426 426
 
427 427
   #if LCD_WIDTH >= 20
428 428
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Nbre impressions");
@@ -458,7 +458,7 @@ namespace Language_fr {
458 458
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Reprendre impr.");
459 459
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Buse: ");
460 460
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Capteur fil.");
461
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Echec origine");
461
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Echec origine");
462 462
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Echec sonde");
463 463
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Trop froid");
464 464
 

+ 3
- 3
Marlin/src/lcd/language/language_gl.h View File

@@ -470,7 +470,7 @@ namespace Language_gl {
470 470
 
471 471
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz da Caixa");
472 472
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Brillo Luces");
473
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("IMPRESORA INCORRECTA");
473
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("IMPRESORA INCORRECTA");
474 474
 
475 475
   #if LCD_WIDTH >= 20
476 476
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Total Impresións");
@@ -506,13 +506,13 @@ namespace Language_gl {
506 506
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Bico: ");
507 507
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sensor Filamento");
508 508
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist mm Sensor Fil");
509
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Fallo ao ir á Orixe");
509
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Fallo ao ir á Orixe");
510 510
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Fallo ao Sondar");
511 511
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Moi Frío");
512 512
 
513 513
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("ESCOLLE FILAMENTO");
514 514
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
515
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Actualizar FW MMU!");
515
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Actualizar FW MMU!");
516 516
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Precisa Atención.");
517 517
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Retomar impr.");
518 518
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Retomando...");

+ 1
- 1
Marlin/src/lcd/language/language_hr.h View File

@@ -132,7 +132,7 @@ namespace Language_hr {
132 132
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
133 133
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvjetljenje");
134 134
 
135
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Neispravan pisač");
135
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Neispravan pisač");
136 136
 
137 137
   #if LCD_WIDTH >= 20
138 138
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Broj printova");

+ 3
- 3
Marlin/src/lcd/language/language_it.h View File

@@ -501,13 +501,13 @@ namespace Language_it {
501 501
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Ugello: ");
502 502
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sens.filo termin.");  // Max 17 characters
503 503
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dist mm filo term.");
504
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Home fallito");
504
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Home fallito");
505 505
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondaggio fallito");
506 506
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600:Troppo freddo");
507 507
 
508 508
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("SCELTA FILAMENTO");
509 509
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
510
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Agg.firmware MMU!");
510
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Agg.firmware MMU!");
511 511
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU chiede attenz.");
512 512
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Riprendi stampa");
513 513
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Ripresa...");
@@ -551,7 +551,7 @@ namespace Language_it {
551 551
   PROGMEM Language_Str MSG_SNAKE                           = _UxGT("Sn4k3");
552 552
   PROGMEM Language_Str MSG_MAZE                            = _UxGT("Maze");
553 553
 
554
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Stampante errata");
554
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Stampante errata");
555 555
 
556 556
   //
557 557
   // Le schermate di Cambio Filamento possono visualizzare fino a 3 linee su un display a 4 righe

+ 1
- 1
Marlin/src/lcd/language/language_jp_kana.h View File

@@ -228,7 +228,7 @@ namespace Language_jp_kana {
228 228
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_LOAD            = _UxGT(MSG_2_LINE("フィラメントソウテンチュウ", "シバラクオマチクダサイ"));   // "Wait for filament load"
229 229
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_RESUME          = _UxGT(MSG_2_LINE("プリントヲサイカイシマス", "シバラクオマチクダサイ"));   // "Wait for print to resume"
230 230
 
231
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("マチガッタプリンター");               // "Wrong printer"
231
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("マチガッタプリンター");               // "Wrong printer"
232 232
 
233 233
   PROGMEM Language_Str MSG_CONFIGURATION                   = _UxGT("セッテイカンリ");
234 234
   PROGMEM Language_Str MSG_ADVANCED_SETTINGS               = _UxGT("ショウサイセッテイ");

+ 1
- 1
Marlin/src/lcd/language/language_ko_KR.h View File

@@ -100,5 +100,5 @@ namespace Language_ko_KR {
100 100
   PROGMEM Language_Str MSG_PRINT_ABORTED                   = _UxGT("취소됨");
101 101
   PROGMEM Language_Str MSG_KILLED                          = _UxGT("죽음. ");
102 102
   PROGMEM Language_Str MSG_STOPPED                         = _UxGT("멈춤. ");
103
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("잘못된 프린터");
103
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("잘못된 프린터");
104 104
 }

+ 1
- 1
Marlin/src/lcd/language/language_nl.h View File

@@ -193,7 +193,7 @@ namespace Language_nl {
193 193
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protocol");
194 194
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Case licht");
195 195
 
196
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Onjuiste printer");
196
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Onjuiste printer");
197 197
 
198 198
   #if LCD_WIDTH >= 20
199 199
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Printed Aantal");

+ 3
- 3
Marlin/src/lcd/language/language_pl.h View File

@@ -437,7 +437,7 @@ namespace Language_pl {
437 437
 
438 438
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Oświetlenie obudowy");
439 439
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jasność oświetlenia");
440
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Niepoprawna drukarka");
440
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Niepoprawna drukarka");
441 441
 
442 442
   #if LCD_WIDTH >= 20
443 443
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Wydrukowano");
@@ -473,13 +473,13 @@ namespace Language_pl {
473 473
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Dysza: ");
474 474
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Czujnik filamentu");
475 475
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Dystans do czujnika mm");
476
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Zerowanie nieudane");
476
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Zerowanie nieudane");
477 477
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Sondowanie nieudane");
478 478
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: za zimne");
479 479
 
480 480
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("WYBIERZ FILAMENT");
481 481
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
482
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Uaktualnij firmware MMU!");
482
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Uaktualnij firmware MMU!");
483 483
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU wymaga uwagi.");
484 484
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Wznów wydruk");
485 485
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Wznawianie...");

+ 1
- 1
Marlin/src/lcd/language/language_pt.h View File

@@ -159,5 +159,5 @@ namespace Language_pt {
159 159
 
160 160
   PROGMEM Language_Str MSG_LCD_ENDSTOPS                    = _UxGT("Fim de curso");
161 161
 
162
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Impressora Incorreta");
162
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora Incorreta");
163 163
 }

+ 2
- 2
Marlin/src/lcd/language/language_pt_br.h View File

@@ -359,7 +359,7 @@ namespace Language_pt_br {
359 359
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Luz da Impressora");
360 360
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Intensidade Brilho");
361 361
 
362
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Impressora Incorreta");
362
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Impressora Incorreta");
363 363
 
364 364
   #if LCD_WIDTH >= 20
365 365
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Total de Impressões");
@@ -389,7 +389,7 @@ namespace Language_pt_br {
389 389
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Continuar Impressão");
390 390
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Bocal: ");
391 391
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Sensor filamento");
392
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Falha ao ir à origem");
392
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Falha ao ir à origem");
393 393
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Falha ao sondar");
394 394
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Muito frio");
395 395
 

+ 2
- 2
Marlin/src/lcd/language/language_ru.h View File

@@ -407,7 +407,7 @@ namespace Language_ru {
407 407
 
408 408
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Подсветка корпуса");
409 409
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Яркость подсветки");
410
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Неверный принтер");
410
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неверный принтер");
411 411
 
412 412
   #if LCD_WIDTH >= 20
413 413
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Счётчик печати");
@@ -438,7 +438,7 @@ namespace Language_ru {
438 438
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("Выдавить ещё");
439 439
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Возобновить печать");
440 440
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Сопла: ");
441
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Возврат не удался");
441
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Возврат не удался");
442 442
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Не удалось прощупать");
443 443
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Низкая Т");
444 444
 

+ 3
- 3
Marlin/src/lcd/language/language_sk.h View File

@@ -453,7 +453,7 @@ namespace Language_sk {
453 453
 
454 454
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Osvetlenie");
455 455
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Jas svetla");
456
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Nesprávna tlačiareň");
456
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Nesprávna tlačiareň");
457 457
 
458 458
   #if LCD_WIDTH >= 20
459 459
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Počet tlačí");
@@ -489,13 +489,13 @@ namespace Language_sk {
489 489
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Tryska: ");
490 490
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Senzor filamentu");
491 491
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Vzd. mm fil. senz.");
492
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Parkovanie zlyhalo");
492
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Parkovanie zlyhalo");
493 493
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Kalibrácia zlyhala");
494 494
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Príliš studený");
495 495
 
496 496
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("VYBERTE FILAMENT");
497 497
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU2");
498
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Aktualizujte FW MMU!");
498
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Aktualizujte FW MMU!");
499 499
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU potrebuje zásah.");
500 500
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Obnoviť tlač");
501 501
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Obnovovanie...");

+ 3
- 3
Marlin/src/lcd/language/language_tr.h View File

@@ -463,7 +463,7 @@ namespace Language_tr {
463 463
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Protokol");
464 464
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Aydınlatmayı Aç");
465 465
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("Aydınlatma Parlaklğı");
466
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Yanlış Yazıcı");
466
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Yanlış Yazıcı");
467 467
 
468 468
   #if LCD_WIDTH >= 20
469 469
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("Baskı Sayısı");
@@ -499,13 +499,13 @@ namespace Language_tr {
499 499
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Nozul: ");
500 500
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("Runout Sensörü");
501 501
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("Aşınma Farkı mm");
502
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Sıfırlama Başarısız");
502
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Sıfırlama Başarısız");
503 503
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("Probing Başarısız");
504 504
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Çok Soğuk");
505 505
 
506 506
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("FILAMAN SEÇ");
507 507
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
508
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("MMU Yaz. Güncelle!");
508
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("MMU Yaz. Güncelle!");
509 509
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Dikkat Gerektirir.");
510 510
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Yaz. Devam Et");
511 511
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Sürdürülüyor...");

+ 1
- 1
Marlin/src/lcd/language/language_uk.h View File

@@ -194,7 +194,7 @@ namespace Language_uk {
194 194
   PROGMEM Language_Str MSG_INFO_PROTOCOL                   = _UxGT("Протокол");
195 195
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("Підсвітка");
196 196
 
197
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("Неправильний принтер");
197
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("Неправильний принтер");
198 198
 
199 199
   #if LCD_WIDTH >= 20
200 200
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("К-сть друків");

+ 1
- 1
Marlin/src/lcd/language/language_vi.h View File

@@ -403,7 +403,7 @@ namespace Language_vi {
403 403
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("Tiếp tục");                             // continue
404 404
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  Đầu Phun: ");                         // Nozzle
405 405
   PROGMEM Language_Str MSG_RUNOUT_SENSOR_ENABLE            = _UxGT("Cảm Biến Hết");                         // Runout Sensor
406
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("Sự nhà không thành công");              // Homing failed
406
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("Sự nhà không thành công");              // Homing failed
407 407
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT(" không thành công");                    // Probing failed
408 408
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: Quá lạnh");
409 409
 

+ 2
- 2
Marlin/src/lcd/language/language_zh_CN.h View File

@@ -331,7 +331,7 @@ namespace Language_zh_CN {
331 331
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外壳灯");     // "Case light"
332 332
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("灯亮度");     // "Light BRIGHTNESS"
333 333
 
334
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("打印机不正确");     // "The printer is incorrect"
334
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印机不正确");     // "The printer is incorrect"
335 335
 
336 336
   #if LCD_WIDTH >= 20
337 337
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("打印计数");     //"Print Count"
@@ -363,7 +363,7 @@ namespace Language_zh_CN {
363 363
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_PURGE    = _UxGT("清除更多");     // "Purge more"
364 364
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_OPTION_RESUME   = _UxGT("恢复打印");     //"Resume print"
365 365
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  喷嘴: ");     // "  Nozzle: "
366
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("归原位失败");     // "Homing failed"
366
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("归原位失败");     // "Homing failed"
367 367
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探针探测失败");     // "Probing failed"
368 368
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: 太凉");     // "M600: Too cold"
369 369
 

+ 3
- 3
Marlin/src/lcd/language/language_zh_TW.h View File

@@ -459,7 +459,7 @@ namespace Language_zh_TW {
459 459
 
460 460
   PROGMEM Language_Str MSG_CASE_LIGHT                      = _UxGT("外殼燈");     // "Case light"
461 461
   PROGMEM Language_Str MSG_CASE_LIGHT_BRIGHTNESS           = _UxGT("燈亮度");     // "Light BRIGHTNESS"
462
-  PROGMEM Language_Str MSG_EXPECTED_PRINTER                = _UxGT("打印機不正確");     // "The printer is incorrect"
462
+  PROGMEM Language_Str MSG_KILL_EXPECTED_PRINTER           = _UxGT("打印機不正確");     // "The printer is incorrect"
463 463
 
464 464
   #if LCD_WIDTH >= 20
465 465
     PROGMEM Language_Str MSG_INFO_PRINT_COUNT              = _UxGT("列印計數");     //"Print Count"
@@ -496,13 +496,13 @@ namespace Language_zh_TW {
496 496
   PROGMEM Language_Str MSG_FILAMENT_CHANGE_NOZZLE          = _UxGT("  噴嘴: ");     // "  Nozzle: "
497 497
   PROGMEM Language_Str MSG_RUNOUT_SENSOR                   = _UxGT("斷絲偵測");    //"Runout Sensor"
498 498
   PROGMEM Language_Str MSG_RUNOUT_DISTANCE_MM              = _UxGT("絲距離mm");   //"Runout Dist mm"
499
-  PROGMEM Language_Str MSG_LCD_HOMING_FAILED               = _UxGT("歸原位失敗");     // "Homing failed"
499
+  PROGMEM Language_Str MSG_KILL_HOMING_FAILED              = _UxGT("歸原位失敗");     // "Homing failed"
500 500
   PROGMEM Language_Str MSG_LCD_PROBING_FAILED              = _UxGT("探針探測失敗");     // "Probing failed"
501 501
   PROGMEM Language_Str MSG_M600_TOO_COLD                   = _UxGT("M600: 太冷");     // "M600: Too cold"
502 502
 
503 503
   PROGMEM Language_Str MSG_MMU2_CHOOSE_FILAMENT_HEADER     = _UxGT("CHOOSE FILAMENT");
504 504
   PROGMEM Language_Str MSG_MMU2_MENU                       = _UxGT("MMU");
505
-  PROGMEM Language_Str MSG_MMU2_WRONG_FIRMWARE             = _UxGT("Update MMU Firmware!");
505
+  PROGMEM Language_Str MSG_KILL_MMU2_FIRMWARE              = _UxGT("Update MMU Firmware!");
506 506
   PROGMEM Language_Str MSG_MMU2_NOT_RESPONDING             = _UxGT("MMU Needs Attention.");
507 507
   PROGMEM Language_Str MSG_MMU2_RESUME                     = _UxGT("Resume Print");
508 508
   PROGMEM Language_Str MSG_MMU2_RESUMING                   = _UxGT("Resuming...");

+ 1
- 1
Marlin/src/module/endstops.cpp View File

@@ -325,7 +325,7 @@ void Endstops::not_homing() {
325 325
   // If the last move failed to trigger an endstop, call kill
326 326
   void Endstops::validate_homing_move() {
327 327
     if (trigger_state()) hit_on_purpose();
328
-    else kill(GET_TEXT(MSG_LCD_HOMING_FAILED));
328
+    else kill(GET_TEXT(MSG_KILL_HOMING_FAILED));
329 329
   }
330 330
 #endif
331 331
 

Loading…
Cancel
Save