Parcourir la source

MSG_WATCH => MSG_INFO_SCREEN

Scott Lahteine il y a 4 ans
Parent
révision
aa4db785f2
33 fichiers modifiés avec 41 ajouts et 41 suppressions
  1. 1
    1
      Marlin/src/lcd/language/language_an.h
  2. 1
    1
      Marlin/src/lcd/language/language_bg.h
  3. 1
    1
      Marlin/src/lcd/language/language_ca.h
  4. 1
    1
      Marlin/src/lcd/language/language_cz.h
  5. 1
    1
      Marlin/src/lcd/language/language_da.h
  6. 1
    1
      Marlin/src/lcd/language/language_de.h
  7. 1
    1
      Marlin/src/lcd/language/language_el.h
  8. 1
    1
      Marlin/src/lcd/language/language_el_gr.h
  9. 1
    1
      Marlin/src/lcd/language/language_en.h
  10. 1
    1
      Marlin/src/lcd/language/language_es.h
  11. 1
    1
      Marlin/src/lcd/language/language_eu.h
  12. 1
    1
      Marlin/src/lcd/language/language_fi.h
  13. 1
    1
      Marlin/src/lcd/language/language_fr.h
  14. 1
    1
      Marlin/src/lcd/language/language_gl.h
  15. 1
    1
      Marlin/src/lcd/language/language_hr.h
  16. 1
    1
      Marlin/src/lcd/language/language_it.h
  17. 1
    1
      Marlin/src/lcd/language/language_jp_kana.h
  18. 1
    1
      Marlin/src/lcd/language/language_ko_KR.h
  19. 1
    1
      Marlin/src/lcd/language/language_nl.h
  20. 1
    1
      Marlin/src/lcd/language/language_pl.h
  21. 1
    1
      Marlin/src/lcd/language/language_pt.h
  22. 1
    1
      Marlin/src/lcd/language/language_pt_br.h
  23. 1
    1
      Marlin/src/lcd/language/language_ru.h
  24. 1
    1
      Marlin/src/lcd/language/language_sk.h
  25. 4
    4
      Marlin/src/lcd/language/language_test.h
  26. 1
    1
      Marlin/src/lcd/language/language_tr.h
  27. 1
    1
      Marlin/src/lcd/language/language_uk.h
  28. 1
    1
      Marlin/src/lcd/language/language_vi.h
  29. 1
    1
      Marlin/src/lcd/language/language_zh_CN.h
  30. 1
    1
      Marlin/src/lcd/language/language_zh_TW.h
  31. 1
    1
      Marlin/src/lcd/menu/menu.h
  32. 1
    1
      Marlin/src/lcd/menu/menu_main.cpp
  33. 6
    6
      Marlin/src/lcd/menu/menu_ubl.cpp

+ 1
- 1
Marlin/src/lcd/language/language_an.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_bg.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_ca.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_cz.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_da.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_de.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_el.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_el_gr.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_en.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_es.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_eu.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_fi.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_fr.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_gl.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_hr.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_it.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_jp_kana.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_ko_KR.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_nl.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_pl.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_pt.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_pt_br.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_ru.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_sk.h Voir le fichier

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

+ 4
- 4
Marlin/src/lcd/language/language_test.h Voir le fichier

@@ -122,7 +122,7 @@ namespace Language_test {
122 122
   #if ENABLED(DISPLAYTEST)
123 123
     PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
124 124
 
125
-    PROGMEM Language_Str MSG_WATCH                           = _UxGT("Display test");
125
+    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("Display test");
126 126
     PROGMEM Language_Str MSG_PREPARE                         = STRG_OKTAL_b;
127 127
     PROGMEM Language_Str MSG_CONTROL                         = STRG_OKTAL_c;
128 128
   #endif
@@ -130,7 +130,7 @@ namespace Language_test {
130 130
   #if ENABLED(WEST)
131 131
     PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
132 132
 
133
-    PROGMEM Language_Str MSG_WATCH                           = _UxGT("\001\002\003\004\005\006\007\010\011");
133
+    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
134 134
     PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
135 135
     PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
136 136
 
@@ -167,7 +167,7 @@ namespace Language_test {
167 167
   #if ENABLED(CYRIL)
168 168
     PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
169 169
 
170
-    PROGMEM Language_Str MSG_WATCH                           = _UxGT("\001\002\003\004\005\006\007\010\011");
170
+    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
171 171
     PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
172 172
     PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
173 173
 
@@ -203,7 +203,7 @@ namespace Language_test {
203 203
   #if ENABLED(KANA)
204 204
     PROGMEM Language_Str WELCOME_MSG                         = _UxGT("Language TEST");
205 205
 
206
-    PROGMEM Language_Str MSG_WATCH                           = _UxGT("\001\002\003\004\005\006\007\010\011");
206
+    PROGMEM Language_Str MSG_INFO_SCREEN                     = _UxGT("\001\002\003\004\005\006\007\010\011");
207 207
     PROGMEM Language_Str MSG_PREPARE                         = _UxGT("UTF8");
208 208
     PROGMEM Language_Str MSG_CONTROL                         = _UxGT("ASCII");
209 209
 

+ 1
- 1
Marlin/src/lcd/language/language_tr.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_uk.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_vi.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_zh_CN.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/language/language_zh_TW.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/menu/menu.h Voir le fichier

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

+ 1
- 1
Marlin/src/lcd/menu/menu_main.cpp Voir le fichier

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

+ 6
- 6
Marlin/src/lcd/menu/menu_ubl.cpp Voir le fichier

@@ -159,7 +159,7 @@ void _menu_ubl_height_adjust() {
159 159
   START_MENU();
160 160
   BACK_ITEM(MSG_EDIT_MESH);
161 161
   EDIT_ITEM(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9, _lcd_ubl_adjust_height_cmd);
162
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
162
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
163 163
   END_MENU();
164 164
 }
165 165
 
@@ -178,7 +178,7 @@ void _lcd_ubl_edit_mesh() {
178 178
   GCODES_ITEM(MSG_UBL_FINE_TUNE_ALL, PSTR("G29 P4 R999 T"));
179 179
   GCODES_ITEM(MSG_UBL_FINE_TUNE_CLOSEST, PSTR("G29 P4 T"));
180 180
   SUBMENU(MSG_UBL_MESH_HEIGHT_ADJUST, _menu_ubl_height_adjust);
181
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
181
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
182 182
   END_MENU();
183 183
 }
184 184
 
@@ -219,7 +219,7 @@ void _lcd_ubl_validate_mesh() {
219 219
     GCODES_ITEM(MSG_UBL_VALIDATE_MESH_M2, PSTR("G28\nG26 C B0 H" STRINGIFY(PREHEAT_2_TEMP_HOTEND) " P"));
220 220
   #endif
221 221
   ACTION_ITEM(MSG_UBL_VALIDATE_CUSTOM_MESH, _lcd_ubl_validate_custom_mesh);
222
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
222
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
223 223
   END_MENU();
224 224
 }
225 225
 
@@ -255,7 +255,7 @@ void _lcd_ubl_mesh_leveling() {
255 255
   BACK_ITEM(MSG_UBL_TOOLS);
256 256
   GCODES_ITEM(MSG_UBL_3POINT_MESH_LEVELING, PSTR("G29 J0"));
257 257
   SUBMENU(MSG_UBL_GRID_MESH_LEVELING, _lcd_ubl_grid_level);
258
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
258
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
259 259
   END_MENU();
260 260
 }
261 261
 
@@ -284,7 +284,7 @@ void _menu_ubl_fillin() {
284 284
   EDIT_ITEM(int3, MSG_UBL_FILLIN_AMOUNT, &ubl_fillin_amount, 0, 9, _lcd_ubl_fillin_amount_cmd);
285 285
   GCODES_ITEM(MSG_UBL_SMART_FILLIN, PSTR("G29 P3 T0"));
286 286
   GCODES_ITEM(MSG_UBL_MANUAL_FILLIN, PSTR("G29 P2 B T0"));
287
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
287
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
288 288
   END_MENU();
289 289
 }
290 290
 
@@ -347,7 +347,7 @@ void _lcd_ubl_build_mesh() {
347 347
   GCODES_ITEM(MSG_UBL_CONTINUE_MESH, PSTR("G29 P1 C"));
348 348
   ACTION_ITEM(MSG_UBL_INVALIDATE_ALL, _lcd_ubl_invalidate);
349 349
   GCODES_ITEM(MSG_UBL_INVALIDATE_CLOSEST, PSTR("G29 I"));
350
-  ACTION_ITEM(MSG_WATCH, ui.return_to_status);
350
+  ACTION_ITEM(MSG_INFO_SCREEN, ui.return_to_status);
351 351
   END_MENU();
352 352
 }
353 353
 

Chargement…
Annuler
Enregistrer