andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename some "kill" messages

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
a7a76f123d
commit
22da1b2b31
31 changed files with 56 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/feature/mmu2/mmu2.cpp
  2. 2
      Marlin/src/gcode/host/M16.cpp
  3. 2
      Marlin/src/lcd/language/language_bg.h
  4. 2
      Marlin/src/lcd/language/language_ca.h
  5. 6
      Marlin/src/lcd/language/language_cz.h
  6. 2
      Marlin/src/lcd/language/language_da.h
  7. 6
      Marlin/src/lcd/language/language_de.h
  8. 2
      Marlin/src/lcd/language/language_el.h
  9. 2
      Marlin/src/lcd/language/language_el_gr.h
  10. 6
      Marlin/src/lcd/language/language_en.h
  11. 6
      Marlin/src/lcd/language/language_es.h
  12. 4
      Marlin/src/lcd/language/language_eu.h
  13. 2
      Marlin/src/lcd/language/language_fi.h
  14. 4
      Marlin/src/lcd/language/language_fr.h
  15. 6
      Marlin/src/lcd/language/language_gl.h
  16. 2
      Marlin/src/lcd/language/language_hr.h
  17. 6
      Marlin/src/lcd/language/language_it.h
  18. 2
      Marlin/src/lcd/language/language_jp_kana.h
  19. 2
      Marlin/src/lcd/language/language_ko_KR.h
  20. 2
      Marlin/src/lcd/language/language_nl.h
  21. 6
      Marlin/src/lcd/language/language_pl.h
  22. 2
      Marlin/src/lcd/language/language_pt.h
  23. 4
      Marlin/src/lcd/language/language_pt_br.h
  24. 4
      Marlin/src/lcd/language/language_ru.h
  25. 6
      Marlin/src/lcd/language/language_sk.h
  26. 6
      Marlin/src/lcd/language/language_tr.h
  27. 2
      Marlin/src/lcd/language/language_uk.h
  28. 2
      Marlin/src/lcd/language/language_vi.h
  29. 4
      Marlin/src/lcd/language/language_zh_CN.h
  30. 6
      Marlin/src/lcd/language/language_zh_TW.h
  31. 2
      Marlin/src/module/endstops.cpp

2
Marlin/src/feature/mmu2/mmu2.cpp
View File

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

2
Marlin/src/gcode/host/M16.cpp
View File

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

2
Marlin/src/lcd/language/language_bg.h
View File

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

2
Marlin/src/lcd/language/language_ca.h
View File

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

6
Marlin/src/lcd/language/language_cz.h
View File

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

2
Marlin/src/lcd/language/language_da.h
View File

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

6
Marlin/src/lcd/language/language_de.h
View File

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

2
Marlin/src/lcd/language/language_el.h
View File

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

2
Marlin/src/lcd/language/language_el_gr.h
View File

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

6
Marlin/src/lcd/language/language_en.h
View File

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

6
Marlin/src/lcd/language/language_es.h
View File

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

4
Marlin/src/lcd/language/language_eu.h
View File

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

2
Marlin/src/lcd/language/language_fi.h
View File

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

4
Marlin/src/lcd/language/language_fr.h
View File

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

6
Marlin/src/lcd/language/language_gl.h
View File

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

2
Marlin/src/lcd/language/language_hr.h
View File

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

6
Marlin/src/lcd/language/language_it.h
View File

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

2
Marlin/src/lcd/language/language_jp_kana.h
View File

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

2
Marlin/src/lcd/language/language_ko_KR.h
View File

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

2
Marlin/src/lcd/language/language_nl.h
View File

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

6
Marlin/src/lcd/language/language_pl.h
View File

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

2
Marlin/src/lcd/language/language_pt.h
View File

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

4
Marlin/src/lcd/language/language_pt_br.h
View File

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

4
Marlin/src/lcd/language/language_ru.h
View File

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

6
Marlin/src/lcd/language/language_sk.h
View File

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

6
Marlin/src/lcd/language/language_tr.h
View File

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

2
Marlin/src/lcd/language/language_uk.h
View File

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

2
Marlin/src/lcd/language/language_vi.h
View File

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

4
Marlin/src/lcd/language/language_zh_CN.h
View File

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

6
Marlin/src/lcd/language/language_zh_TW.h
View File

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

2
Marlin/src/module/endstops.cpp
View File

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

Write Preview
Loading…
Cancel
Save