Browse Source

MSG_WATCH => MSG_INFO_SCREEN

pull/1/head
Scott Lahteine 5 years ago
parent
commit
aa4db785f2
  1. 2
      Marlin/src/lcd/language/language_an.h
  2. 2
      Marlin/src/lcd/language/language_bg.h
  3. 2
      Marlin/src/lcd/language/language_ca.h
  4. 2
      Marlin/src/lcd/language/language_cz.h
  5. 2
      Marlin/src/lcd/language/language_da.h
  6. 2
      Marlin/src/lcd/language/language_de.h
  7. 2
      Marlin/src/lcd/language/language_el.h
  8. 2
      Marlin/src/lcd/language/language_el_gr.h
  9. 2
      Marlin/src/lcd/language/language_en.h
  10. 2
      Marlin/src/lcd/language/language_es.h
  11. 2
      Marlin/src/lcd/language/language_eu.h
  12. 2
      Marlin/src/lcd/language/language_fi.h
  13. 2
      Marlin/src/lcd/language/language_fr.h
  14. 2
      Marlin/src/lcd/language/language_gl.h
  15. 2
      Marlin/src/lcd/language/language_hr.h
  16. 2
      Marlin/src/lcd/language/language_it.h
  17. 2
      Marlin/src/lcd/language/language_jp_kana.h
  18. 2
      Marlin/src/lcd/language/language_ko_KR.h
  19. 2
      Marlin/src/lcd/language/language_nl.h
  20. 2
      Marlin/src/lcd/language/language_pl.h
  21. 2
      Marlin/src/lcd/language/language_pt.h
  22. 2
      Marlin/src/lcd/language/language_pt_br.h
  23. 2
      Marlin/src/lcd/language/language_ru.h
  24. 2
      Marlin/src/lcd/language/language_sk.h
  25. 8
      Marlin/src/lcd/language/language_test.h
  26. 2
      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. 2
      Marlin/src/lcd/language/language_zh_CN.h
  30. 2
      Marlin/src/lcd/language/language_zh_TW.h
  31. 2
      Marlin/src/lcd/menu/menu.h
  32. 2
      Marlin/src/lcd/menu/menu_main.cpp
  33. 12
      Marlin/src/lcd/menu/menu_ubl.cpp

2
Marlin/src/lcd/language/language_an.h

@ -127,7 +127,7 @@ namespace Language_an {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Cargar memoria");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restaurar memoria");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Tornar a cargar");
PROGMEM Language_Str MSG_WATCH = _UxGT("Informacion");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Informacion");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
PROGMEM Language_Str MSG_TUNE = _UxGT("Achustar");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausar impresion");

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

@ -112,7 +112,7 @@ namespace Language_bg {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Зареди от EPROM");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Фабрични настройки");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Обнови");
PROGMEM Language_Str MSG_WATCH = _UxGT("Преглед");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Преглед");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Действия");
PROGMEM Language_Str MSG_TUNE = _UxGT("Настройка");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Пауза");

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

@ -122,7 +122,7 @@ namespace Language_ca {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carrega memoria");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Restaura valors");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Actualitza");
PROGMEM Language_Str MSG_WATCH = _UxGT("Pantalla Info.");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Pantalla Info.");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Prepara");
PROGMEM Language_Str MSG_TUNE = _UxGT("Ajusta");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausa impressio");

2
Marlin/src/lcd/language/language_cz.h

@ -323,7 +323,7 @@ namespace Language_cz {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aktualizace z SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset tiskárny");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Obnovit");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info obrazovka");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info obrazovka");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Připrava tisku");
PROGMEM Language_Str MSG_TUNE = _UxGT("Doladění tisku");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Spustit tisk");

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

@ -107,7 +107,7 @@ namespace Language_da {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Hent fra EEPROM");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Gendan failsafe");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Genopfrisk");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info skærm");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info skærm");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Forbered");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pause printet");
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Forsæt printet");

2
Marlin/src/lcd/language/language_de.h

@ -303,7 +303,7 @@ namespace Language_de {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("FW Update vom Medium");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Drucker neustarten");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Aktualisieren");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Vorbereitung");
PROGMEM Language_Str MSG_TUNE = _UxGT("Justierung");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Starte Druck");

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

@ -138,7 +138,7 @@ namespace Language_el {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Φόρτωση");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Επαναφορά ασφαλούς αντιγράφου"); //SHORTEN
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ανανέωση");
PROGMEM Language_Str MSG_WATCH = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Προετοιμασία");
PROGMEM Language_Str MSG_TUNE = _UxGT("Συντονισμός");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Παύση εκτύπωσης");

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

@ -148,7 +148,7 @@ namespace Language_el_gr {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Φόρτωση");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Επαναφορά ασφαλούς αντιγράφου");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ανανέωση");
PROGMEM Language_Str MSG_WATCH = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Οθόνη πληροφόρησης");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Προετοιμασία");
PROGMEM Language_Str MSG_TUNE = _UxGT("Συντονισμός");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Παύση εκτύπωσης");

2
Marlin/src/lcd/language/language_en.h

@ -314,7 +314,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Media Update");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reset Printer");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Refresh");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info Screen");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info Screen");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Prepare");
PROGMEM Language_Str MSG_TUNE = _UxGT("Tune");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Start Print");

2
Marlin/src/lcd/language/language_es.h

@ -289,7 +289,7 @@ namespace Language_es {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Actualizar SD/USB");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetear Impresora");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Recargar");
PROGMEM Language_Str MSG_WATCH = _UxGT("Pantalla de Inf.");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Pantalla de Inf.");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
PROGMEM Language_Str MSG_TUNE = _UxGT("Ajustar");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Iniciar impresión");

2
Marlin/src/lcd/language/language_eu.h

@ -190,7 +190,7 @@ namespace Language_eu {
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Larri. berriz.");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("EEPROM-a hasieratu");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Berriz kargatu");
PROGMEM Language_Str MSG_WATCH = _UxGT("Pantaila info");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Pantaila info");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Prestatu");
PROGMEM Language_Str MSG_TUNE = _UxGT("Doitu");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausatu inprimak.");

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

@ -99,7 +99,7 @@ namespace Language_fi {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Lataa muistista");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Palauta oletus");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Päivitä");
PROGMEM Language_Str MSG_WATCH = _UxGT("Seuraa");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Seuraa");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Valmistele");
PROGMEM Language_Str MSG_TUNE = _UxGT("Säädä");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Keskeytä tulostus");

2
Marlin/src/lcd/language/language_fr.h

@ -287,7 +287,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("MaJ Firmware SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("RaZ imprimante");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Actualiser");
PROGMEM Language_Str MSG_WATCH = _UxGT("Surveiller");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Surveiller");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Préparer");
PROGMEM Language_Str MSG_TUNE = _UxGT("Régler");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Démarrer impression");

2
Marlin/src/lcd/language/language_gl.h

@ -119,7 +119,7 @@ namespace Language_gl {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Cargar de memo.");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Cargar de firm.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Volver a cargar");
PROGMEM Language_Str MSG_WATCH = _UxGT("Monitorizacion");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Monitorizacion");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
PROGMEM Language_Str MSG_TUNE = _UxGT("Axustar");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausar impres.");

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

@ -100,7 +100,7 @@ namespace Language_hr {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Učitaj memoriju");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Učitaj failsafe");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Osvježi");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info screen");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info screen");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Pripremi");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pauziraj print");
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Nastavi print");

2
Marlin/src/lcd/language/language_it.h

@ -312,7 +312,7 @@ namespace Language_it {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aggiorna media");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetta stampante");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Aggiorna");
PROGMEM Language_Str MSG_WATCH = _UxGT("Schermata info");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Schermata info");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Prepara");
PROGMEM Language_Str MSG_TUNE = _UxGT("Regola");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Avvia stampa");

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

@ -151,7 +151,7 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("EEPROMカラヨミコミ"); // "Load memory"
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("セッテイリセット"); // "Restore failsafe"
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("リフレッシュ"); // "Refresh"
PROGMEM Language_Str MSG_WATCH = _UxGT("ジョウホウガメン"); // "Info screen"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("ジョウホウガメン"); // "Info screen"
PROGMEM Language_Str MSG_PREPARE = _UxGT("ジュンビセッテイ"); // "Prepare"
PROGMEM Language_Str MSG_TUNE = _UxGT("チョウセイ"); // "Tune"
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("イチジテイシ"); // "Pause print"

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

@ -87,7 +87,7 @@ namespace Language_ko_KR {
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("설정 되돌리기");
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("EEPROM 초기화");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("새로고침");
PROGMEM Language_Str MSG_WATCH = _UxGT("처음으로");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("처음으로");
PROGMEM Language_Str MSG_PREPARE = _UxGT("준비하기");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("일시정지");
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("재시작");

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

@ -125,7 +125,7 @@ namespace Language_nl {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Geheugen laden");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Noodstop reset");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Ververs");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info scherm");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info scherm");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Voorbereiden");
PROGMEM Language_Str MSG_TUNE = _UxGT("Afstellen");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Print pauzeren");

2
Marlin/src/lcd/language/language_pl.h

@ -311,7 +311,7 @@ namespace Language_pl {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Uaktualnij kartę");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetuj drukarkę");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Odswież");
PROGMEM Language_Str MSG_WATCH = _UxGT("Ekran główny");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Ekran główny");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Przygotuj");
PROGMEM Language_Str MSG_TUNE = _UxGT("Strojenie");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Start wydruku");

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

@ -115,7 +115,7 @@ namespace Language_pt {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Carregar da memoria");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Rest. de emergen.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT(" Recarregar");
PROGMEM Language_Str MSG_WATCH = _UxGT("Monitorizar");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Monitorizar");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
PROGMEM Language_Str MSG_TUNE = _UxGT("Afinar");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausar impressão");

2
Marlin/src/lcd/language/language_pt_br.h

@ -257,7 +257,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Atualiz. SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Resetar Impressora");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Atualização");
PROGMEM Language_Str MSG_WATCH = _UxGT("Informações");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Informações");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Preparar");
PROGMEM Language_Str MSG_TUNE = _UxGT("Ajustar");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pausar impressão");

2
Marlin/src/lcd/language/language_ru.h

@ -278,7 +278,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Обновление прошивки");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Сброс принтера");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Обновить");
PROGMEM Language_Str MSG_WATCH = _UxGT("Информационный экран");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Информационный экран");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Подготовить");
PROGMEM Language_Str MSG_TUNE = _UxGT("Настроить");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Начало печати");

2
Marlin/src/lcd/language/language_sk.h

@ -314,7 +314,7 @@ namespace Language_sk {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Aktualizovať z SD");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Reštart. tlačiar.");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Obnoviť");
PROGMEM Language_Str MSG_WATCH = _UxGT("Info. obrazovka");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Info. obrazovka");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Príprava tlače");
PROGMEM Language_Str MSG_TUNE = _UxGT("Doladenie tlače");
PROGMEM Language_Str MSG_START_PRINT = _UxGT("Spustiť tlač");

8
Marlin/src/lcd/language/language_test.h

@ -122,7 +122,7 @@ namespace Language_test {
#if ENABLED(DISPLAYTEST)
PROGMEM Language_Str WELCOME_MSG = _UxGT("Language TEST");
PROGMEM Language_Str MSG_WATCH = _UxGT("Display test");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Display test");
PROGMEM Language_Str MSG_PREPARE = STRG_OKTAL_b;
PROGMEM Language_Str MSG_CONTROL = STRG_OKTAL_c;
#endif
@ -130,7 +130,7 @@ namespace Language_test {
#if ENABLED(WEST)
PROGMEM Language_Str WELCOME_MSG = _UxGT("Language TEST");
PROGMEM Language_Str MSG_WATCH = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_PREPARE = _UxGT("UTF8");
PROGMEM Language_Str MSG_CONTROL = _UxGT("ASCII");
@ -167,7 +167,7 @@ namespace Language_test {
#if ENABLED(CYRIL)
PROGMEM Language_Str WELCOME_MSG = _UxGT("Language TEST");
PROGMEM Language_Str MSG_WATCH = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_PREPARE = _UxGT("UTF8");
PROGMEM Language_Str MSG_CONTROL = _UxGT("ASCII");
@ -203,7 +203,7 @@ namespace Language_test {
#if ENABLED(KANA)
PROGMEM Language_Str WELCOME_MSG = _UxGT("Language TEST");
PROGMEM Language_Str MSG_WATCH = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("\001\002\003\004\005\006\007\010\011");
PROGMEM Language_Str MSG_PREPARE = _UxGT("UTF8");
PROGMEM Language_Str MSG_CONTROL = _UxGT("ASCII");

2
Marlin/src/lcd/language/language_tr.h

@ -271,7 +271,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("SD Güncellemesi");
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Yazıcıyı Resetle");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Yenile");
PROGMEM Language_Str MSG_WATCH = _UxGT("Bilgi Ekranı");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Bilgi Ekranı");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Hazırlık");
PROGMEM Language_Str MSG_TUNE = _UxGT("Ayar");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Duraklat");

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

@ -149,7 +149,7 @@ namespace Language_uk {
PROGMEM Language_Str MSG_LOAD_EEPROM = _UxGT("Зчитати з ПЗП");
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("Відновити базові");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Поновити");
PROGMEM Language_Str MSG_WATCH = _UxGT("Інформація");
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Інформація");
PROGMEM Language_Str MSG_PREPARE = _UxGT("Підготувати");
PROGMEM Language_Str MSG_TUNE = _UxGT("Підлаштування");
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Призупинити друк");

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

@ -279,7 +279,7 @@ namespace Language_vi {
PROGMEM Language_Str MSG_MEDIA_UPDATE = _UxGT("Cập Nhật phương tiện"); // Update media
PROGMEM Language_Str MSG_RESET_PRINTER = _UxGT("Bặt Lại Máy In");
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("Cập Nhật"); // Refresh
PROGMEM Language_Str MSG_WATCH = _UxGT("Màn Hình Thông Tin"); // Info screen
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("Màn Hình Thông Tin"); // Info screen
PROGMEM Language_Str MSG_PREPARE = _UxGT("Chuẩn bị"); // Prepare
PROGMEM Language_Str MSG_TUNE = _UxGT("Điều Chỉnh"); // Tune
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Tạm dừng in"); // Pause print

2
Marlin/src/lcd/language/language_zh_CN.h

@ -251,7 +251,7 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("恢复安全值"); //"Restore failsafe"
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("初始化设置"); // "Initialize EEPROM"
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("刷新"); //"Refresh"
PROGMEM Language_Str MSG_WATCH = _UxGT("信息屏"); //"Info screen"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("信息屏"); //"Info screen"
PROGMEM Language_Str MSG_PREPARE = _UxGT("准备"); //"Prepare"
PROGMEM Language_Str MSG_TUNE = _UxGT("调整"); //"Tune"
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("暂停打印"); //"Pause print"

2
Marlin/src/lcd/language/language_zh_TW.h

@ -251,7 +251,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_RESTORE_FAILSAFE = _UxGT("恢復安全值"); //"Restore failsafe"
PROGMEM Language_Str MSG_INIT_EEPROM = _UxGT("初始化設置"); // "Initialize EEPROM"
PROGMEM Language_Str MSG_REFRESH = LCD_STR_REFRESH _UxGT("刷新"); //"Refresh"
PROGMEM Language_Str MSG_WATCH = _UxGT("資訊界面"); //"Info screen"
PROGMEM Language_Str MSG_INFO_SCREEN = _UxGT("資訊界面"); //"Info screen"
PROGMEM Language_Str MSG_PREPARE = _UxGT("準備"); //"Prepare"
PROGMEM Language_Str MSG_TUNE = _UxGT("調整"); //"Tune"
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("暫停列印"); //"Pause print"

2
Marlin/src/lcd/menu/menu.h

@ -358,7 +358,7 @@ class MenuItem_bool : public MenuEditItemBase {
* MenuItem_<type>::action(arg3...)
*
* Examples:
* BACK_ITEM(MSG_WATCH)
* BACK_ITEM(MSG_INFO_SCREEN)
* MenuItem_back::action(plabel, ...)
* MenuItem_back::draw(sel, row, plabel, ...)
*

2
Marlin/src/lcd/menu/menu_main.cpp

@ -81,7 +81,7 @@ extern const char M21_STR[];
void menu_main() {
START_MENU();
BACK_ITEM(MSG_WATCH);
BACK_ITEM(MSG_INFO_SCREEN);
const bool busy = printingIsActive()
#if ENABLED(SDSUPPORT)

12
Marlin/src/lcd/menu/menu_ubl.cpp

@ -159,7 +159,7 @@ void _menu_ubl_height_adjust() {
START_MENU();
BACK_ITEM(MSG_EDIT_MESH);
EDIT_ITEM(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9, _lcd_ubl_adjust_height_cmd);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -178,7 +178,7 @@ void _lcd_ubl_edit_mesh() {
GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R999 T"));
GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -219,7 +219,7 @@ void _lcd_ubl_validate_mesh() {
GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
#endif
ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -255,7 +255,7 @@ void _lcd_ubl_mesh_leveling() {
BACK_ITEM(MSG_UBL_TOOLS);
GCODES_ITEM(MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
SUBMENU(MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -284,7 +284,7 @@ void _menu_ubl_fillin() {
EDIT_ITEM(int3, MSG_UBL_FILLIN_AMOUNT, &ubl_fillin_amount, 0, 9, _lcd_ubl_fillin_amount_cmd);
GCODES_ITEM(MSG_UBL_SMART_FILLIN, PSTR("G29 P3 T0"));
GCODES_ITEM(MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}
@ -347,7 +347,7 @@ void _lcd_ubl_build_mesh() {
GCODES_ITEM(MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
ACTION_ITEM(MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
GCODES_ITEM(MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
ACTION_ITEM(MSG_WATCH, ui.return_to_status);
ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
END_MENU();
}

Loading…
Cancel
Save