Selaa lähdekoodia

"SD card" => "Media" (#14951)

Marcio Teixeira 5 vuotta sitten
vanhempi
commit
263d7d37af
33 muutettua tiedostoa jossa 220 lisäystä ja 220 poistoa
  1. 6
    6
      Marlin/src/lcd/language/language_an.h
  2. 6
    6
      Marlin/src/lcd/language/language_bg.h
  3. 6
    6
      Marlin/src/lcd/language/language_ca.h
  4. 7
    7
      Marlin/src/lcd/language/language_cz.h
  5. 6
    6
      Marlin/src/lcd/language/language_da.h
  6. 9
    9
      Marlin/src/lcd/language/language_de.h
  7. 6
    6
      Marlin/src/lcd/language/language_el-gr.h
  8. 6
    6
      Marlin/src/lcd/language/language_el.h
  9. 18
    18
      Marlin/src/lcd/language/language_en.h
  10. 6
    6
      Marlin/src/lcd/language/language_es.h
  11. 6
    6
      Marlin/src/lcd/language/language_eu.h
  12. 6
    6
      Marlin/src/lcd/language/language_fi.h
  13. 9
    9
      Marlin/src/lcd/language/language_fr.h
  14. 6
    6
      Marlin/src/lcd/language/language_gl.h
  15. 6
    6
      Marlin/src/lcd/language/language_hr.h
  16. 9
    9
      Marlin/src/lcd/language/language_it.h
  17. 6
    6
      Marlin/src/lcd/language/language_jp-kana.h
  18. 6
    6
      Marlin/src/lcd/language/language_ko_KR.h
  19. 6
    6
      Marlin/src/lcd/language/language_nl.h
  20. 6
    6
      Marlin/src/lcd/language/language_pl.h
  21. 7
    7
      Marlin/src/lcd/language/language_pt-br.h
  22. 6
    6
      Marlin/src/lcd/language/language_pt.h
  23. 9
    9
      Marlin/src/lcd/language/language_ru.h
  24. 9
    9
      Marlin/src/lcd/language/language_sk.h
  25. 8
    8
      Marlin/src/lcd/language/language_tr.h
  26. 6
    6
      Marlin/src/lcd/language/language_uk.h
  27. 6
    6
      Marlin/src/lcd/language/language_zh_CN.h
  28. 6
    6
      Marlin/src/lcd/language/language_zh_TW.h
  29. 1
    1
      Marlin/src/lcd/menu/menu.h
  30. 1
    1
      Marlin/src/lcd/menu/menu_advanced.cpp
  31. 12
    12
      Marlin/src/lcd/menu/menu_main.cpp
  32. 4
    4
      Marlin/src/lcd/menu/menu_media.cpp
  33. 3
    3
      Marlin/src/lcd/ultralcd.cpp

+ 6
- 6
Marlin/src/lcd/language/language_an.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define NOT_EXTENDED_ISO10646_1_5X7
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" parada.")
36
-#define MSG_SD_INSERTED                     _UxGT("Tarcheta mesa")
37
-#define MSG_SD_REMOVED                      _UxGT("Tarcheta sacada")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Tarcheta mesa")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Tarcheta sacada")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Menu prencipal")
40 40
 #define MSG_AUTOSTART                       _UxGT("Inicio automatico")
@@ -146,8 +146,8 @@
146 146
 #define MSG_PAUSE_PRINT                     _UxGT("Pausar impresion")
147 147
 #define MSG_RESUME_PRINT                    _UxGT("Contin. impresion")
148 148
 #define MSG_STOP_PRINT                      _UxGT("Detener Impresion")
149
-#define MSG_CARD_MENU                       _UxGT("Menu de SD")
150
-#define MSG_NO_CARD                         _UxGT("No i hai tarcheta")
149
+#define MSG_MEDIA_MENU                      _UxGT("Menu de SD")
150
+#define MSG_NO_MEDIA                        _UxGT("No i hai tarcheta")
151 151
 #define MSG_DWELL                           _UxGT("Reposo...")
152 152
 #define MSG_USERWAIT                        _UxGT("Aguardand ordines")
153 153
 #define MSG_PRINT_ABORTED                   _UxGT("Impres. cancelada")
@@ -163,8 +163,8 @@
163 163
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("DesRet F")
164 164
 #define MSG_AUTORETRACT                     _UxGT("Retraccion auto.")
165 165
 #define MSG_FILAMENTCHANGE                  _UxGT("Cambear filamento")
166
-#define MSG_INIT_SDCARD                     _UxGT("Encetan. tarcheta")
167
-#define MSG_CHANGE_SDCARD                   _UxGT("Cambiar tarcheta")
166
+#define MSG_INIT_MEDIA                      _UxGT("Encetan. tarcheta")
167
+#define MSG_CHANGE_MEDIA                    _UxGT("Cambiar tarcheta")
168 168
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z fuera")
169 169
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Auto-Test")
170 170
 #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_bg.h Näytä tiedosto

@@ -32,8 +32,8 @@
32 32
 #define CHARSIZE 2
33 33
 
34 34
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" Готов.")
35
-#define MSG_SD_INSERTED                     _UxGT("Картата е поставена")
36
-#define MSG_SD_REMOVED                      _UxGT("Картата е извадена")
35
+#define MSG_MEDIA_INSERTED                  _UxGT("Картата е поставена")
36
+#define MSG_MEDIA_REMOVED                   _UxGT("Картата е извадена")
37 37
 #define MSG_MAIN                            _UxGT("Меню")
38 38
 #define MSG_AUTOSTART                       _UxGT("Автостарт")
39 39
 #define MSG_DISABLE_STEPPERS                _UxGT("Изкл. двигатели")
@@ -114,8 +114,8 @@
114 114
 #define MSG_PAUSE_PRINT                     _UxGT("Пауза")
115 115
 #define MSG_RESUME_PRINT                    _UxGT("Възобнови печата")
116 116
 #define MSG_STOP_PRINT                      _UxGT("Спри печата")
117
-#define MSG_CARD_MENU                       _UxGT("Меню карта")
118
-#define MSG_NO_CARD                         _UxGT("Няма карта")
117
+#define MSG_MEDIA_MENU                      _UxGT("Меню карта")
118
+#define MSG_NO_MEDIA                        _UxGT("Няма карта")
119 119
 #define MSG_DWELL                           _UxGT("Почивка...")
120 120
 #define MSG_USERWAIT                        _UxGT("Изчакване")
121 121
 #define MSG_PRINT_ABORTED                   _UxGT("Печатът е прекъснат")
@@ -131,8 +131,8 @@
131 131
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("Възврат  V")
132 132
 #define MSG_AUTORETRACT                     _UxGT("Автоoткат")
133 133
 #define MSG_FILAMENTCHANGE                  _UxGT("Смяна нишка")
134
-#define MSG_INIT_SDCARD                     _UxGT("Иниц. SD-Карта")
135
-#define MSG_CHANGE_SDCARD                   _UxGT("Смяна SD-Карта")
134
+#define MSG_INIT_MEDIA                      _UxGT("Иниц. SD-Карта")
135
+#define MSG_CHANGE_MEDIA                    _UxGT("Смяна SD-Карта")
136 136
 #define MSG_ZPROBE_OUT                      _UxGT("Z-сондата е извадена")
137 137
 #define MSG_ZPROBE_ZOFFSET                  _UxGT("Z Отстояние")
138 138
 #define MSG_BABYSTEP_X                      _UxGT("Министъпка X")

+ 6
- 6
Marlin/src/lcd/language/language_ca.h Näytä tiedosto

@@ -32,8 +32,8 @@
32 32
 #define CHARSIZE 2
33 33
 
34 34
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")
35
-#define MSG_SD_INSERTED                     _UxGT("Targeta detectada.")
36
-#define MSG_SD_REMOVED                      _UxGT("Targeta extreta.")
35
+#define MSG_MEDIA_INSERTED                  _UxGT("Targeta detectada.")
36
+#define MSG_MEDIA_REMOVED                   _UxGT("Targeta extreta.")
37 37
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops")
38 38
 #define MSG_MAIN                            _UxGT("Menú principal")
39 39
 #define MSG_AUTOSTART                       _UxGT("Inici automatic")
@@ -149,8 +149,8 @@
149 149
 #define MSG_PAUSE_PRINT                     _UxGT("Pausa impressio")
150 150
 #define MSG_RESUME_PRINT                    _UxGT("Repren impressio")
151 151
 #define MSG_STOP_PRINT                      _UxGT("Atura impressio.")
152
-#define MSG_CARD_MENU                       _UxGT("Imprimeix de SD")
153
-#define MSG_NO_CARD                         _UxGT("No hi ha targeta")
152
+#define MSG_MEDIA_MENU                      _UxGT("Imprimeix de SD")
153
+#define MSG_NO_MEDIA                        _UxGT("No hi ha targeta")
154 154
 #define MSG_DWELL                           _UxGT("En repos...")
155 155
 #define MSG_USERWAIT                        _UxGT("Esperant usuari..")
156 156
 #define MSG_PRINT_ABORTED                   _UxGT("Imp. cancelada")
@@ -166,8 +166,8 @@
166 166
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("DesRet V")
167 167
 #define MSG_AUTORETRACT                     _UxGT("Auto retraccio")
168 168
 #define MSG_FILAMENTCHANGE                  _UxGT("Canvia filament")
169
-#define MSG_INIT_SDCARD                     _UxGT("Inicialitza SD")
170
-#define MSG_CHANGE_SDCARD                   _UxGT("Canvia SD")
169
+#define MSG_INIT_MEDIA                      _UxGT("Inicialitza SD")
170
+#define MSG_CHANGE_MEDIA                    _UxGT("Canvia SD")
171 171
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z fora")
172 172
 #define MSG_BLTOUCH_RESET                   _UxGT("Reinicia BLTouch")
173 173
 #define MSG_HOME                            _UxGT("Home")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST

+ 7
- 7
Marlin/src/lcd/language/language_cz.h Näytä tiedosto

@@ -42,8 +42,8 @@
42 42
 #define MSG_YES                             _UxGT("ANO")
43 43
 #define MSG_NO                              _UxGT("NE")
44 44
 #define MSG_BACK                            _UxGT("Zpět")
45
-#define MSG_SD_INSERTED                     _UxGT("Karta vložena")
46
-#define MSG_SD_REMOVED                      _UxGT("Karta vyjmuta")
45
+#define MSG_MEDIA_INSERTED                  _UxGT("Karta vložena")
46
+#define MSG_MEDIA_REMOVED                   _UxGT("Karta vyjmuta")
47 47
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstopy") // max 8 znaku
48 48
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Soft Endstopy")
49 49
 #define MSG_MAIN                            _UxGT("Hlavní nabídka")
@@ -278,7 +278,7 @@
278 278
 #define MSG_LOAD_EEPROM                     _UxGT("Načíst nastavení")
279 279
 #define MSG_RESTORE_FAILSAFE                _UxGT("Obnovit výchozí")
280 280
 #define MSG_INIT_EEPROM                     _UxGT("Inic. EEPROM")
281
-#define MSG_SD_UPDATE                       _UxGT("Aktualizace z SD")
281
+#define MSG_MEDIA_UPDATE                    _UxGT("Aktualizace z SD")
282 282
 #define MSG_RESET_PRINTER                   _UxGT("Reset tiskárny")
283 283
 #define MSG_REFRESH                         _UxGT("Obnovit")
284 284
 #define MSG_WATCH                           _UxGT("Info obrazovka")
@@ -291,8 +291,8 @@
291 291
 #define MSG_RESUME_PRINT                    _UxGT("Obnovit tisk")
292 292
 #define MSG_STOP_PRINT                      _UxGT("Zastavit tisk")
293 293
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Obnova výpadku")
294
-#define MSG_CARD_MENU                       _UxGT("Tisknout z SD")
295
-#define MSG_NO_CARD                         _UxGT("Žádná SD karta")
294
+#define MSG_MEDIA_MENU                      _UxGT("Tisknout z SD")
295
+#define MSG_NO_MEDIA                        _UxGT("Žádná SD karta")
296 296
 #define MSG_DWELL                           _UxGT("Uspáno...")
297 297
 #define MSG_USERWAIT                        _UxGT("Čekání na uživ...")
298 298
 #define MSG_PRINT_PAUSED                    _UxGT("Tisk pozastaven")
@@ -321,8 +321,8 @@
321 321
 #define MSG_FILAMENTUNLOAD                  _UxGT("Vysunout filament")
322 322
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Vysunout vše")
323 323
 
324
-#define MSG_INIT_SDCARD                     _UxGT("Načíst SD kartu")
325
-#define MSG_CHANGE_SDCARD                   _UxGT("Vyměnit SD kartu")
324
+#define MSG_INIT_MEDIA                      _UxGT("Načíst SD kartu")
325
+#define MSG_CHANGE_MEDIA                    _UxGT("Vyměnit SD kartu")
326 326
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z mimo podl")
327 327
 #define MSG_SKEW_FACTOR                     _UxGT("Faktor zkosení")
328 328
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_da.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" er klar")
36
-#define MSG_SD_INSERTED                     _UxGT("Kort isat")
37
-#define MSG_SD_REMOVED                      _UxGT("Kort fjernet")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Kort isat")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Kort fjernet")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Menu")
40 40
 #define MSG_AUTOSTART                       _UxGT("Autostart")
@@ -146,8 +146,8 @@
146 146
 #define MSG_PAUSE_PRINT                     _UxGT("Pause printet")
147 147
 #define MSG_RESUME_PRINT                    _UxGT("Forsæt printet")
148 148
 #define MSG_STOP_PRINT                      _UxGT("Stop printet")
149
-#define MSG_CARD_MENU                       _UxGT("Print fra SD")
150
-#define MSG_NO_CARD                         _UxGT("Intet SD kort")
149
+#define MSG_MEDIA_MENU                      _UxGT("Print fra SD")
150
+#define MSG_NO_MEDIA                        _UxGT("Intet SD kort")
151 151
 #define MSG_DWELL                           _UxGT("Dvale...")
152 152
 #define MSG_USERWAIT                        _UxGT("Venter på bruger...")
153 153
 #define MSG_PRINT_ABORTED                   _UxGT("Print annulleret")
@@ -163,8 +163,8 @@
163 163
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
164 164
 #define MSG_AUTORETRACT                     _UxGT("AutoRetr.")
165 165
 #define MSG_FILAMENTCHANGE                  _UxGT("Skift filament")
166
-#define MSG_INIT_SDCARD                     _UxGT("Init. SD card")
167
-#define MSG_CHANGE_SDCARD                   _UxGT("Skift SD kort")
166
+#define MSG_INIT_MEDIA                      _UxGT("Init. SD card")
167
+#define MSG_CHANGE_MEDIA                    _UxGT("Skift SD kort")
168 168
 #define MSG_ZPROBE_OUT                      _UxGT("Probe udenfor plade")
169 169
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Selv-Test")
170 170
 #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")

+ 9
- 9
Marlin/src/lcd/language/language_de.h Näytä tiedosto

@@ -37,9 +37,9 @@
37 37
 #define MSG_YES                             _UxGT("JA")
38 38
 #define MSG_NO                              _UxGT("NEIN")
39 39
 #define MSG_BACK                            _UxGT("Zurück")
40
-#define MSG_SD_INSERTED                     _UxGT("SD-Karte erkannt")
41
-#define MSG_SD_REMOVED                      _UxGT("SD-Karte entfernt")
42
-#define MSG_SD_RELEASED                     _UxGT("SD-Karte freigeg.")
40
+#define MSG_MEDIA_INSERTED                  _UxGT("SD-Karte erkannt")
41
+#define MSG_MEDIA_REMOVED                   _UxGT("SD-Karte entfernt")
42
+#define MSG_MEDIA_RELEASED                  _UxGT("SD-Karte freigeg.")
43 43
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstopp") // Max length 8 characters
44 44
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Software-Endstopp")
45 45
 #define MSG_MAIN                            _UxGT("Hauptmenü")
@@ -276,7 +276,7 @@
276 276
 #define MSG_LOAD_EEPROM                     _UxGT("Konfig. laden")
277 277
 #define MSG_RESTORE_FAILSAFE                _UxGT("Standardwerte laden")
278 278
 #define MSG_INIT_EEPROM                     _UxGT("Werkseinstellungen")
279
-#define MSG_SD_UPDATE                       _UxGT("SD-Firmware-Update")
279
+#define MSG_MEDIA_UPDATE                    _UxGT("SD-Firmware-Update")
280 280
 #define MSG_RESET_PRINTER                   _UxGT("Drucker neustarten")
281 281
 #define MSG_REFRESH                         _UxGT("Aktualisieren")
282 282
 #define MSG_WATCH                           _UxGT("Info")
@@ -294,8 +294,8 @@
294 294
 #define MSG_RESUME_PRINT                    _UxGT("SD-Druck fortsetzen")
295 295
 #define MSG_STOP_PRINT                      _UxGT("SD-Druck abbrechen")
296 296
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Wiederh. n. Stroma.")
297
-#define MSG_CARD_MENU                       _UxGT("Druck v. SD-Karte")
298
-#define MSG_NO_CARD                         _UxGT("Keine SD-Karte")
297
+#define MSG_MEDIA_MENU                      _UxGT("Druck v. SD-Karte")
298
+#define MSG_NO_MEDIA                        _UxGT("Keine SD-Karte")
299 299
 #define MSG_DWELL                           _UxGT("Warten...")
300 300
 #define MSG_USERWAIT                        _UxGT("Klick zum Fortsetzen")
301 301
 #define MSG_PRINT_PAUSED                    _UxGT("Druck pausiert...")
@@ -323,9 +323,9 @@
323 323
 #define MSG_FILAMENTLOAD                    _UxGT("Filament laden")
324 324
 #define MSG_FILAMENTUNLOAD                  _UxGT("Filament entladen")
325 325
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Alles entladen")
326
-#define MSG_INIT_SDCARD                     _UxGT("SD-Karte initial.")  // Manually initialize the SD-card via user interface
327
-#define MSG_CHANGE_SDCARD                   _UxGT("SD-Karte getauscht") // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
328
-#define MSG_RELEASE_SDCARD                  _UxGT("SD-Karte freigeben") // if Marlin gets confused - M22
326
+#define MSG_INIT_MEDIA                      _UxGT("SD-Karte initial.")  // Manually initialize the SD-card via user interface
327
+#define MSG_CHANGE_MEDIA                    _UxGT("SD-Karte getauscht") // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
328
+#define MSG_RELEASE_MEDIA                   _UxGT("SD-Karte freigeben") // if Marlin gets confused - M22
329 329
 #define MSG_ZPROBE_OUT                      _UxGT("Z-Sonde außerhalb")
330 330
 #define MSG_SKEW_FACTOR                     _UxGT("Korrekturfaktor")
331 331
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_el-gr.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
36
-#define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
37
-#define MSG_SD_REMOVED                      _UxGT("Αφαίρεση κάρτας")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Εισαγωγή κάρτας")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Αφαίρεση κάρτας")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Βασική Οθόνη")
40 40
 #define MSG_AUTOSTART                       _UxGT("Αυτόματη εκκίνηση")
@@ -144,8 +144,8 @@
144 144
 #define MSG_PAUSE_PRINT                     _UxGT("Παύση εκτύπωσης")
145 145
 #define MSG_RESUME_PRINT                    _UxGT("Συνέχιση εκτύπωσης")
146 146
 #define MSG_STOP_PRINT                      _UxGT("Διακοπή εκτύπωσης")
147
-#define MSG_CARD_MENU                       _UxGT("Εκτύπωση από SD")
148
-#define MSG_NO_CARD                         _UxGT("Δεν βρέθηκε SD")
147
+#define MSG_MEDIA_MENU                      _UxGT("Εκτύπωση από SD")
148
+#define MSG_NO_MEDIA                        _UxGT("Δεν βρέθηκε SD")
149 149
 #define MSG_DWELL                           _UxGT("Αναστολή λειτουργίας…")
150 150
 #define MSG_USERWAIT                        _UxGT("Αναμονή για χρήστη…")
151 151
 #define MSG_PRINT_ABORTED                   _UxGT("Διακόπτεται η εκτύπωση")
@@ -161,8 +161,8 @@
161 161
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
162 162
 #define MSG_AUTORETRACT                     _UxGT("Αυτόματη ανάσυρση")
163 163
 #define MSG_FILAMENTCHANGE                  _UxGT("Αλλαγή νήματος")
164
-#define MSG_INIT_SDCARD                     _UxGT("Προετοιμασία κάρτας SD")
165
-#define MSG_CHANGE_SDCARD                   _UxGT("Αλλαγή κάρτας SD")
164
+#define MSG_INIT_MEDIA                      _UxGT("Προετοιμασία κάρτας SD")
165
+#define MSG_CHANGE_MEDIA                    _UxGT("Αλλαγή κάρτας SD")
166 166
 #define MSG_ZPROBE_OUT                      _UxGT("Διερεύνηση Z εκτός κλίνης")
167 167
 #define MSG_YX_UNHOMED                      _UxGT("Επαναφορά Χ/Υ πριν από Ζ")
168 168
 #define MSG_XYZ_UNHOMED                     _UxGT("Επαναφορά ΧΥΖ πρώτα")

+ 6
- 6
Marlin/src/lcd/language/language_el.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
36
-#define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
37
-#define MSG_SD_REMOVED                      _UxGT("Αφαίρεση κάρτας")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Εισαγωγή κάρτας")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Αφαίρεση κάρτας")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Βασική Οθόνη")
40 40
 #define MSG_AUTOSTART                       _UxGT("Αυτόματη εκκίνηση")
@@ -144,8 +144,8 @@
144 144
 #define MSG_PAUSE_PRINT                     _UxGT("Παύση εκτύπωσης")
145 145
 #define MSG_RESUME_PRINT                    _UxGT("Συνέχιση εκτύπωσης")
146 146
 #define MSG_STOP_PRINT                      _UxGT("Διακοπή εκτύπωσης")
147
-#define MSG_CARD_MENU                       _UxGT("Εκτύπωση από SD")
148
-#define MSG_NO_CARD                         _UxGT("Δεν βρέθηκε SD")
147
+#define MSG_MEDIA_MENU                      _UxGT("Εκτύπωση από SD")
148
+#define MSG_NO_MEDIA                        _UxGT("Δεν βρέθηκε SD")
149 149
 #define MSG_DWELL                           _UxGT("Αναστολή λειτουργίας")
150 150
 #define MSG_USERWAIT                        _UxGT("Αναμονή για χρήστη")
151 151
 #define MSG_PRINT_ABORTED                   _UxGT("Διακόπτεται η εκτύπωση") //SHORTEN
@@ -161,8 +161,8 @@
161 161
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
162 162
 #define MSG_AUTORETRACT                     _UxGT("Αυτόματη ανάσυρση")
163 163
 #define MSG_FILAMENTCHANGE                  _UxGT("Αλλαγή νήματος")
164
-#define MSG_INIT_SDCARD                     _UxGT("Προετοιμασία κάρτας SD")  //SHORTEN
165
-#define MSG_CHANGE_SDCARD                   _UxGT("Αλλαγή κάρτας SD")
164
+#define MSG_INIT_MEDIA                      _UxGT("Προετοιμασία κάρτας SD")  //SHORTEN
165
+#define MSG_CHANGE_MEDIA                    _UxGT("Αλλαγή κάρτας SD")
166 166
 #define MSG_ZPROBE_OUT                      _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης") //SHORTEN
167 167
 #define MSG_YX_UNHOMED                      _UxGT("Επαναφορά Χ/Υ πριν από Ζ") //SHORTEN
168 168
 #define MSG_XYZ_UNHOMED                     _UxGT("Επαναφορά ΧΥΖ πρώτα")

+ 18
- 18
Marlin/src/lcd/language/language_en.h Näytä tiedosto

@@ -61,14 +61,14 @@
61 61
 #ifndef MSG_BACK
62 62
   #define MSG_BACK                            _UxGT("Back")
63 63
 #endif
64
-#ifndef MSG_SD_INSERTED
65
-  #define MSG_SD_INSERTED                     _UxGT("Card Inserted")
64
+#ifndef MSG_MEDIA_INSERTED
65
+  #define MSG_MEDIA_INSERTED                  _UxGT("Media Inserted")
66 66
 #endif
67
-#ifndef MSG_SD_REMOVED
68
-  #define MSG_SD_REMOVED                      _UxGT("Card Removed")
67
+#ifndef MSG_MEDIA_REMOVED
68
+  #define MSG_MEDIA_REMOVED                   _UxGT("Media Removed")
69 69
 #endif
70
-#ifndef MSG_SD_RELEASED
71
-  #define MSG_SD_RELEASED                     _UxGT("Card Released")
70
+#ifndef MSG_MEDIA_RELEASED
71
+  #define MSG_MEDIA_RELEASED                  _UxGT("Media Released")
72 72
 #endif
73 73
 #ifndef MSG_LCD_ENDSTOPS
74 74
   #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
@@ -765,8 +765,8 @@
765 765
 #ifndef MSG_INIT_EEPROM
766 766
   #define MSG_INIT_EEPROM                     _UxGT("Initialize EEPROM")
767 767
 #endif
768
-#ifndef MSG_SD_UPDATE
769
-  #define MSG_SD_UPDATE                       _UxGT("SD Update")
768
+#ifndef MSG_MEDIA_UPDATE
769
+  #define MSG_MEDIA_UPDATE                    _UxGT("Media Update")
770 770
 #endif
771 771
 #ifndef MSG_RESET_PRINTER
772 772
   #define MSG_RESET_PRINTER                   _UxGT("Reset Printer")
@@ -819,11 +819,11 @@
819 819
 #ifndef MSG_OUTAGE_RECOVERY
820 820
   #define MSG_OUTAGE_RECOVERY                 _UxGT("Outage Recovery")
821 821
 #endif
822
-#ifndef MSG_CARD_MENU
823
-  #define MSG_CARD_MENU                       _UxGT("Print from SD")
822
+#ifndef MSG_MEDIA_MENU
823
+  #define MSG_MEDIA_MENU                      _UxGT("Print from Media")
824 824
 #endif
825
-#ifndef MSG_NO_CARD
826
-  #define MSG_NO_CARD                         _UxGT("No SD Card")
825
+#ifndef MSG_NO_MEDIA
826
+  #define MSG_NO_MEDIA                        _UxGT("No Media")
827 827
 #endif
828 828
 #ifndef MSG_DWELL
829 829
   #define MSG_DWELL                           _UxGT("Sleep...")
@@ -909,14 +909,14 @@
909 909
 #ifndef MSG_FILAMENTUNLOAD_ALL
910 910
   #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Unload All")
911 911
 #endif
912
-#ifndef MSG_INIT_SDCARD
913
-  #define MSG_INIT_SDCARD                     _UxGT("Init. SD Card")
912
+#ifndef MSG_INIT_MEDIA
913
+  #define MSG_INIT_MEDIA                      _UxGT("Init. Media")
914 914
 #endif
915
-#ifndef MSG_CHANGE_SDCARD
916
-  #define MSG_CHANGE_SDCARD                   _UxGT("Change SD Card")
915
+#ifndef MSG_CHANGE_MEDIA
916
+  #define MSG_CHANGE_MEDIA                    _UxGT("Change Media")
917 917
 #endif
918
-#ifndef MSG_RELEASE_SDCARD
919
-  #define MSG_RELEASE_SDCARD                  _UxGT("Release SD Card")
918
+#ifndef MSG_RELEASE_MEDIA
919
+  #define MSG_RELEASE_MEDIA                   _UxGT("Release Media")
920 920
 #endif
921 921
 #ifndef MSG_ZPROBE_OUT
922 922
   #define MSG_ZPROBE_OUT                      _UxGT("Z Probe Past Bed")

+ 6
- 6
Marlin/src/lcd/language/language_es.h Näytä tiedosto

@@ -34,8 +34,8 @@
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
36 36
 #define MSG_BACK                            _UxGT("Atrás")
37
-#define MSG_SD_INSERTED                     _UxGT("Tarjeta colocada")
38
-#define MSG_SD_REMOVED                      _UxGT("Tarjeta retirada")
37
+#define MSG_MEDIA_INSERTED                  _UxGT("Tarjeta colocada")
38
+#define MSG_MEDIA_REMOVED                   _UxGT("Tarjeta retirada")
39 39
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
40 40
 #define MSG_MAIN                            _UxGT("Menú principal")
41 41
 #define MSG_AUTOSTART                       _UxGT("Inicio automático")
@@ -143,8 +143,8 @@
143 143
 #define MSG_PAUSE_PRINT                     _UxGT("Pausar impresión")
144 144
 #define MSG_RESUME_PRINT                    _UxGT("Reanudar impresión")
145 145
 #define MSG_STOP_PRINT                      _UxGT("Detener impresión")
146
-#define MSG_CARD_MENU                       _UxGT("Menú de SD")
147
-#define MSG_NO_CARD                         _UxGT("No hay tarjeta SD")
146
+#define MSG_MEDIA_MENU                      _UxGT("Menú de SD")
147
+#define MSG_NO_MEDIA                        _UxGT("No hay tarjeta SD")
148 148
 #define MSG_DWELL                           _UxGT("Reposo...")
149 149
 #define MSG_USERWAIT                        _UxGT("Esperando órdenes")
150 150
 #define MSG_PRINT_ABORTED                   _UxGT("Impresión cancelada")
@@ -160,8 +160,8 @@
160 160
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("DesRet V")
161 161
 #define MSG_AUTORETRACT                     _UxGT("Retracción Auto.")
162 162
 #define MSG_FILAMENTCHANGE                  _UxGT("Cambiar filamento")
163
-#define MSG_INIT_SDCARD                     _UxGT("Iniciando tarjeta")
164
-#define MSG_CHANGE_SDCARD                   _UxGT("Cambiar tarjeta")
163
+#define MSG_INIT_MEDIA                      _UxGT("Iniciando tarjeta")
164
+#define MSG_CHANGE_MEDIA                    _UxGT("Cambiar tarjeta")
165 165
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z fuera")
166 166
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Auto-Prueba")
167 167
 #define MSG_BLTOUCH_RESET                   _UxGT("Reiniciar BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_eu.h Näytä tiedosto

@@ -34,8 +34,8 @@
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prest.")
36 36
 #define MSG_BACK                            _UxGT("Atzera")
37
-#define MSG_SD_INSERTED                     _UxGT("Txartela sartuta")
38
-#define MSG_SD_REMOVED                      _UxGT("Txartela kenduta")
37
+#define MSG_MEDIA_INSERTED                  _UxGT("Txartela sartuta")
38
+#define MSG_MEDIA_REMOVED                   _UxGT("Txartela kenduta")
39 39
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
40 40
 #define MSG_MAIN                            _UxGT("Menu nagusia")
41 41
 #define MSG_AUTOSTART                       _UxGT("Auto hasiera")
@@ -246,8 +246,8 @@
246 246
 #define MSG_PAUSE_PRINT                     _UxGT("Pausatu inprimak.")
247 247
 #define MSG_RESUME_PRINT                    _UxGT("Jarraitu inprima.")
248 248
 #define MSG_STOP_PRINT                      _UxGT("Gelditu inprima.")
249
-#define MSG_CARD_MENU                       _UxGT("SD-tik inprimatu")
250
-#define MSG_NO_CARD                         _UxGT("Ez dago SD-rik")
249
+#define MSG_MEDIA_MENU                      _UxGT("SD-tik inprimatu")
250
+#define MSG_NO_MEDIA                        _UxGT("Ez dago SD-rik")
251 251
 #define MSG_DWELL                           _UxGT("Lo egin...")
252 252
 #define MSG_USERWAIT                        _UxGT("Aginduak zain...")
253 253
 #define MSG_PRINT_PAUSED                    _UxGT("Inprim. geldi.")
@@ -268,8 +268,8 @@
268 268
 #define MSG_FILAMENTLOAD                    _UxGT("Harizpia kargatu")
269 269
 #define MSG_FILAMENTUNLOAD                  _UxGT("Harizpia deskargatu")
270 270
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Erabat deskargatu")
271
-#define MSG_INIT_SDCARD                     _UxGT("Hasieratu SD-a")
272
-#define MSG_CHANGE_SDCARD                   _UxGT("Aldatu txartela")
271
+#define MSG_INIT_MEDIA                      _UxGT("Hasieratu SD-a")
272
+#define MSG_CHANGE_MEDIA                    _UxGT("Aldatu txartela")
273 273
 #define MSG_ZPROBE_OUT                      _UxGT("Z zunda kanpora")
274 274
 #define MSG_SKEW_FACTOR                     _UxGT("Okertze faktorea")
275 275
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_fi.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" valmis.")
36
-#define MSG_SD_INSERTED                     _UxGT("Kortti asetettu")
37
-#define MSG_SD_REMOVED                      _UxGT("Kortti poistettu")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Kortti asetettu")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Kortti poistettu")
38 38
 #define MSG_MAIN                            _UxGT("Palaa")
39 39
 #define MSG_AUTOSTART                       _UxGT("Automaatti")
40 40
 #define MSG_DISABLE_STEPPERS                _UxGT("Vapauta moottorit")
@@ -136,8 +136,8 @@
136 136
 #define MSG_PAUSE_PRINT                     _UxGT("Keskeytä tulostus")
137 137
 #define MSG_RESUME_PRINT                    _UxGT("Jatka tulostusta")
138 138
 #define MSG_STOP_PRINT                      _UxGT("Pysäytä tulostus")
139
-#define MSG_CARD_MENU                       _UxGT("Korttivalikko")
140
-#define MSG_NO_CARD                         _UxGT("Ei korttia")
139
+#define MSG_MEDIA_MENU                      _UxGT("Korttivalikko")
140
+#define MSG_NO_MEDIA                        _UxGT("Ei korttia")
141 141
 #define MSG_DWELL                           _UxGT("Nukkumassa...")
142 142
 #define MSG_USERWAIT                        _UxGT("Odotet. valintaa")
143 143
 #define MSG_PRINT_ABORTED                   _UxGT("Print aborted")
@@ -153,8 +153,8 @@
153 153
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
154 154
 #define MSG_AUTORETRACT                     _UxGT("AutoVeto.")
155 155
 #define MSG_FILAMENTCHANGE                  _UxGT("Change filament")
156
-#define MSG_INIT_SDCARD                     _UxGT("Init. SD-Card")
157
-#define MSG_CHANGE_SDCARD                   _UxGT("Change SD-Card")
156
+#define MSG_INIT_MEDIA                      _UxGT("Init. SD-Card")
157
+#define MSG_CHANGE_MEDIA                    _UxGT("Change SD-Card")
158 158
 #define MSG_ZPROBE_OUT                      _UxGT("Z probe out. bed")
159 159
 #define MSG_HOME                            _UxGT("Home")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
160 160
 #define MSG_FIRST                           _UxGT("first")

+ 9
- 9
Marlin/src/lcd/language/language_fr.h Näytä tiedosto

@@ -36,9 +36,9 @@
36 36
 #define MSG_YES                             _UxGT("Oui")
37 37
 #define MSG_NO                              _UxGT("Non")
38 38
 #define MSG_BACK                            _UxGT("Retour")
39
-#define MSG_SD_INSERTED                     _UxGT("Carte insérée")
40
-#define MSG_SD_REMOVED                      _UxGT("Carte retirée")
41
-#define MSG_SD_RELEASED                     _UxGT("Carte libérée")
39
+#define MSG_MEDIA_INSERTED                  _UxGT("Carte insérée")
40
+#define MSG_MEDIA_REMOVED                   _UxGT("Carte retirée")
41
+#define MSG_MEDIA_RELEASED                  _UxGT("Carte libérée")
42 42
 #define MSG_LCD_ENDSTOPS                    _UxGT("Butées")
43 43
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Butées SW")
44 44
 #define MSG_MAIN                            _UxGT("Menu principal")
@@ -273,7 +273,7 @@
273 273
 #define MSG_LOAD_EEPROM                     _UxGT("Charger config.")
274 274
 #define MSG_RESTORE_FAILSAFE                _UxGT("Restaurer défauts")
275 275
 #define MSG_INIT_EEPROM                     _UxGT("Initialiser EEPROM")
276
-#define MSG_SD_UPDATE                       _UxGT("MaJ Firmware SD")
276
+#define MSG_MEDIA_UPDATE                    _UxGT("MaJ Firmware SD")
277 277
 #define MSG_RESET_PRINTER                   _UxGT("RaZ imprimante")
278 278
 #define MSG_REFRESH                         _UxGT("Actualiser")
279 279
 #define MSG_WATCH                           _UxGT("Surveiller")
@@ -291,8 +291,8 @@
291 291
 #define MSG_RESUME_PRINT                    _UxGT("Reprendre impr.")
292 292
 #define MSG_STOP_PRINT                      _UxGT("Arrêter impr.")
293 293
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Récupér. coupure")
294
-#define MSG_CARD_MENU                       _UxGT("Impression SD")
295
-#define MSG_NO_CARD                         _UxGT("Pas de carte")
294
+#define MSG_MEDIA_MENU                      _UxGT("Impression SD")
295
+#define MSG_NO_MEDIA                        _UxGT("Pas de carte")
296 296
 #define MSG_DWELL                           _UxGT("Repos...")
297 297
 #define MSG_USERWAIT                        _UxGT("Attente utilis.")
298 298
 #define MSG_PRINT_PAUSED                    _UxGT("Impr. en pause")
@@ -321,9 +321,9 @@
321 321
 #define MSG_FILAMENTLOAD                    _UxGT("Charger filament")
322 322
 #define MSG_FILAMENTUNLOAD                  _UxGT("Retrait filament")
323 323
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Décharger tout")
324
-#define MSG_INIT_SDCARD                     _UxGT("Init. la carte SD")
325
-#define MSG_CHANGE_SDCARD                   _UxGT("Actualiser carte SD")
326
-#define MSG_RELEASE_SDCARD                  _UxGT("Retirer carte SD")
324
+#define MSG_INIT_MEDIA                      _UxGT("Init. la carte SD")
325
+#define MSG_CHANGE_MEDIA                    _UxGT("Actualiser carte SD")
326
+#define MSG_RELEASE_MEDIA                   _UxGT("Retirer carte SD")
327 327
 #define MSG_ZPROBE_OUT                      _UxGT("Sonde Z hors lit")
328 328
 #define MSG_SKEW_FACTOR                     _UxGT("Facteur écart")
329 329
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_gl.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define NOT_EXTENDED_ISO10646_1_5X7
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
36
-#define MSG_SD_INSERTED                     _UxGT("Tarxeta inserida")
37
-#define MSG_SD_REMOVED                      _UxGT("Tarxeta retirada")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Tarxeta inserida")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Tarxeta retirada")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("FinCarro")
39 39
 #define MSG_MAIN                            _UxGT("Menu principal")
40 40
 #define MSG_AUTOSTART                       _UxGT("Autoarranque")
@@ -145,8 +145,8 @@
145 145
 #define MSG_PAUSE_PRINT                     _UxGT("Pausar impres.")
146 146
 #define MSG_RESUME_PRINT                    _UxGT("Seguir impres.")
147 147
 #define MSG_STOP_PRINT                      _UxGT("Deter impres.")
148
-#define MSG_CARD_MENU                       _UxGT("Tarxeta SD")
149
-#define MSG_NO_CARD                         _UxGT("Sen tarxeta SD")
148
+#define MSG_MEDIA_MENU                      _UxGT("Tarxeta SD")
149
+#define MSG_NO_MEDIA                        _UxGT("Sen tarxeta SD")
150 150
 #define MSG_DWELL                           _UxGT("En repouso...")
151 151
 #define MSG_USERWAIT                        _UxGT("A espera...")
152 152
 #define MSG_PRINT_ABORTED                   _UxGT("Impre. cancelada")
@@ -162,8 +162,8 @@
162 162
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("Recuperacion V")
163 163
 #define MSG_AUTORETRACT                     _UxGT("Retraccion auto.")
164 164
 #define MSG_FILAMENTCHANGE                  _UxGT("Cambiar filamen.")
165
-#define MSG_INIT_SDCARD                     _UxGT("Iniciando SD")
166
-#define MSG_CHANGE_SDCARD                   _UxGT("Cambiar SD")
165
+#define MSG_INIT_MEDIA                      _UxGT("Iniciando SD")
166
+#define MSG_CHANGE_MEDIA                    _UxGT("Cambiar SD")
167 167
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda-Z sen cama")
168 168
 #define MSG_HOME                            _UxGT("Home")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
169 169
 #define MSG_BLTOUCH_SELFTEST                _UxGT("Comprobar BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_hr.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" spreman.")
36
-#define MSG_SD_INSERTED                     _UxGT("SD kartica umetnuta")
37
-#define MSG_SD_REMOVED                      _UxGT("SD kartica uklonjena")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("SD kartica umetnuta")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("SD kartica uklonjena")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Main")
40 40
 #define MSG_AUTOSTART                       _UxGT("Auto pokretanje")
@@ -145,8 +145,8 @@
145 145
 #define MSG_PAUSE_PRINT                     _UxGT("Pauziraj print")
146 146
 #define MSG_RESUME_PRINT                    _UxGT("Nastavi print")
147 147
 #define MSG_STOP_PRINT                      _UxGT("Zaustavi print")
148
-#define MSG_CARD_MENU                       _UxGT("Printaj s SD kartice")
149
-#define MSG_NO_CARD                         _UxGT("Nema SD kartice")
148
+#define MSG_MEDIA_MENU                      _UxGT("Printaj s SD kartice")
149
+#define MSG_NO_MEDIA                        _UxGT("Nema SD kartice")
150 150
 #define MSG_DWELL                           _UxGT("Sleep...")
151 151
 #define MSG_USERWAIT                        _UxGT("Čekaj korisnika...")
152 152
 #define MSG_PRINT_ABORTED                   _UxGT("Print otkazan")
@@ -162,8 +162,8 @@
162 162
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  V")
163 163
 #define MSG_AUTORETRACT                     _UxGT("AutoRetr.")
164 164
 #define MSG_FILAMENTCHANGE                  _UxGT("Promijeni filament")
165
-#define MSG_INIT_SDCARD                     _UxGT("Init. SD karticu")
166
-#define MSG_CHANGE_SDCARD                   _UxGT("Promijeni SD karticu")
165
+#define MSG_INIT_MEDIA                      _UxGT("Init. SD karticu")
166
+#define MSG_CHANGE_MEDIA                    _UxGT("Promijeni SD karticu")
167 167
 #define MSG_ZPROBE_OUT                      _UxGT("Z probe out. bed")
168 168
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Self-Test")
169 169
 #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")

+ 9
- 9
Marlin/src/lcd/language/language_it.h Näytä tiedosto

@@ -35,9 +35,9 @@
35 35
 #define MSG_YES                             _UxGT("SI")
36 36
 #define MSG_NO                              _UxGT("NO")
37 37
 #define MSG_BACK                            _UxGT("Indietro")
38
-#define MSG_SD_INSERTED                     _UxGT("SD Card inserita")
39
-#define MSG_SD_REMOVED                      _UxGT("SD Card rimossa")
40
-#define MSG_SD_RELEASED                     _UxGT("SD Card rilasciata")
38
+#define MSG_MEDIA_INSERTED                  _UxGT("SD Card inserita")
39
+#define MSG_MEDIA_REMOVED                   _UxGT("SD Card rimossa")
40
+#define MSG_MEDIA_RELEASED                  _UxGT("SD Card rilasciata")
41 41
 #define MSG_LCD_ENDSTOPS                    _UxGT("Finecor.") // Max 8 caratteri
42 42
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Finecorsa Soft")
43 43
 #define MSG_MAIN                            _UxGT("Menu principale")
@@ -274,7 +274,7 @@
274 274
 #define MSG_LOAD_EEPROM                     _UxGT("Carica impostazioni")
275 275
 #define MSG_RESTORE_FAILSAFE                _UxGT("Ripristina imp.")
276 276
 #define MSG_INIT_EEPROM                     _UxGT("Inizializza EEPROM")
277
-#define MSG_SD_UPDATE                       _UxGT("Aggiorna SD")
277
+#define MSG_MEDIA_UPDATE                    _UxGT("Aggiorna SD")
278 278
 #define MSG_RESET_PRINTER                   _UxGT("Resetta stampante")
279 279
 #define MSG_REFRESH                         _UxGT("Aggiorna")
280 280
 #define MSG_WATCH                           _UxGT("Schermata info")
@@ -292,8 +292,8 @@
292 292
 #define MSG_RESUME_PRINT                    _UxGT("Riprendi stampa")
293 293
 #define MSG_STOP_PRINT                      _UxGT("Arresta stampa")
294 294
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Ripresa da PowerLoss")
295
-#define MSG_CARD_MENU                       _UxGT("Stampa da SD")
296
-#define MSG_NO_CARD                         _UxGT("SD non presente")
295
+#define MSG_MEDIA_MENU                      _UxGT("Stampa da SD")
296
+#define MSG_NO_MEDIA                        _UxGT("SD non presente")
297 297
 #define MSG_DWELL                           _UxGT("Sospensione...")
298 298
 #define MSG_USERWAIT                        _UxGT("Premi tasto..")
299 299
 #define MSG_PRINT_PAUSED                    _UxGT("Stampa sospesa")
@@ -322,9 +322,9 @@
322 322
 #define MSG_FILAMENTLOAD                    _UxGT("Carica filamento")
323 323
 #define MSG_FILAMENTUNLOAD                  _UxGT("Rimuovi filamento")
324 324
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Rimuovi tutto")
325
-#define MSG_INIT_SDCARD                     _UxGT("Iniz. SD card")
326
-#define MSG_CHANGE_SDCARD                   _UxGT("Cambia SD card")
327
-#define MSG_RELEASE_SDCARD                  _UxGT("Rilascia SD card")
325
+#define MSG_INIT_MEDIA                      _UxGT("Iniz. SD card")
326
+#define MSG_CHANGE_MEDIA                    _UxGT("Cambia SD card")
327
+#define MSG_RELEASE_MEDIA                   _UxGT("Rilascia SD card")
328 328
 #define MSG_ZPROBE_OUT                      _UxGT("Z probe fuori piatto")
329 329
 #define MSG_SKEW_FACTOR                     _UxGT("Fattore distorsione")
330 330
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_jp-kana.h Näytä tiedosto

@@ -38,8 +38,8 @@
38 38
 
39 39
 // 片仮名表示定義
40 40
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" ready.")
41
-#define MSG_SD_INSERTED                     _UxGT("カードガソウニュウサレマシタ")        // "Card inserted"
42
-#define MSG_SD_REMOVED                      _UxGT("カードガアリマセン")               // "Card removed"
41
+#define MSG_MEDIA_INSERTED                  _UxGT("カードガソウニュウサレマシタ")        // "Card inserted"
42
+#define MSG_MEDIA_REMOVED                   _UxGT("カードガアリマセン")               // "Card removed"
43 43
 #define MSG_LCD_ENDSTOPS                    _UxGT("エンドストップ")                  // "Endstops" // Max length 8 characters
44 44
 #define MSG_MAIN                            _UxGT("メイン")                       // "Main"
45 45
 #define MSG_AUTOSTART                       _UxGT("ジドウカイシ")                   // "Autostart"
@@ -139,8 +139,8 @@
139 139
 #define MSG_PAUSE_PRINT                     _UxGT("イチジテイシ")                  // "Pause print"
140 140
 #define MSG_RESUME_PRINT                    _UxGT("プリントサイカイ")                // "Resume print"
141 141
 #define MSG_STOP_PRINT                      _UxGT("プリントテイシ")                 // "Stop print"
142
-#define MSG_CARD_MENU                       _UxGT("SDカードカラプリント")            // "Print from SD"
143
-#define MSG_NO_CARD                         _UxGT("SDカードガアリマセン")            // "No SD card"
142
+#define MSG_MEDIA_MENU                      _UxGT("SDカードカラプリント")            // "Print from SD"
143
+#define MSG_NO_MEDIA                        _UxGT("SDカードガアリマセン")            // "No SD card"
144 144
 #define MSG_DWELL                           _UxGT("キュウシ")                     // "Sleep..."
145 145
 #define MSG_USERWAIT                        _UxGT("シバラクオマチクダサイ")           // "Wait for user..."
146 146
 #define MSG_PRINT_ABORTED                   _UxGT("プリントガチュウシサレマシタ")       // "Print aborted"
@@ -156,8 +156,8 @@
156 156
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("ホショウソクド mm/s")            // "UnRet  V"
157 157
 #define MSG_AUTORETRACT                     _UxGT("ジドウヒキコミ")                 // "AutoRetr."
158 158
 #define MSG_FILAMENTCHANGE                  _UxGT("フィラメントコウカン")              // "Change filament"
159
-#define MSG_INIT_SDCARD                     _UxGT("SDカードサイヨミコミ")             // "Init. SD card"
160
-#define MSG_CHANGE_SDCARD                   _UxGT("SDカードコウカン")               // "Change SD card"
159
+#define MSG_INIT_MEDIA                      _UxGT("SDカードサイヨミコミ")             // "Init. SD card"
160
+#define MSG_CHANGE_MEDIA                    _UxGT("SDカードコウカン")               // "Change SD card"
161 161
 #define MSG_ZPROBE_OUT                      _UxGT("Zプローブ ベッドガイ")            // "Z probe out. bed"
162 162
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch ジコシンダン")          // "BLTouch Self-Test"
163 163
 #define MSG_BLTOUCH_RESET                   _UxGT("BLTouch リセット")             // "Reset BLTouch"

+ 6
- 6
Marlin/src/lcd/language/language_ko_KR.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 
34 34
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" 준비.")
35 35
 #define MSG_BACK                            _UxGT("뒤로")
36
-#define MSG_SD_INSERTED                     _UxGT("카드 삽입됨")
37
-#define MSG_SD_REMOVED                      _UxGT("카드 제거됨")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("카드 삽입됨")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("카드 제거됨")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("엔드스탑")
39 39
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("소프트 엔드스탑")
40 40
 #define MSG_MAIN                            _UxGT("뒤로")
@@ -259,8 +259,8 @@
259 259
 #define MSG_RESUME_PRINT                    _UxGT("재시작")
260 260
 #define MSG_STOP_PRINT                      _UxGT("출력중지")
261 261
 //#define MSG_OUTAGE_RECOVERY               _UxGT("Outage Recovery")
262
-#define MSG_CARD_MENU                       _UxGT("SD 카드출력")
263
-#define MSG_NO_CARD                         _UxGT("SD 카드없음")
262
+#define MSG_MEDIA_MENU                      _UxGT("SD 카드출력")
263
+#define MSG_NO_MEDIA                        _UxGT("SD 카드없음")
264 264
 #define MSG_DWELL                           _UxGT("슬립모드...")
265 265
 //#define MSG_USERWAIT                      _UxGT("Click to resume...")
266 266
 #define MSG_PRINT_PAUSED                    _UxGT("일시 정지됨")
@@ -282,8 +282,8 @@
282 282
 //#define MSG_FILAMENTLOAD                  _UxGT("Load filament")
283 283
 //#define MSG_FILAMENTUNLOAD                _UxGT("Unload filament")
284 284
 //#define MSG_FILAMENTUNLOAD_ALL            _UxGT("Unload All")
285
-//#define MSG_INIT_SDCARD                   _UxGT("Init. SD card")
286
-//#define MSG_CHANGE_SDCARD                 _UxGT("Change SD card")
285
+//#define MSG_INIT_MEDIA                    _UxGT("Init. SD card")
286
+//#define MSG_CHANGE_MEDIA                  _UxGT("Change SD card")
287 287
 //#define MSG_ZPROBE_OUT                    _UxGT("Z Probe past bed")
288 288
 //#define MSG_SKEW_FACTOR                   _UxGT("Skew Factor")
289 289
 //#define MSG_BLTOUCH                       _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_nl.h Näytä tiedosto

@@ -34,8 +34,8 @@
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gereed.")
36 36
 #define MSG_BACK                            _UxGT("Terug")
37
-#define MSG_SD_INSERTED                     _UxGT("Kaart ingestoken")
38
-#define MSG_SD_REMOVED                      _UxGT("Kaart verwijderd")
37
+#define MSG_MEDIA_INSERTED                  _UxGT("Kaart ingestoken")
38
+#define MSG_MEDIA_REMOVED                   _UxGT("Kaart verwijderd")
39 39
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
40 40
 #define MSG_MAIN                            _UxGT("Hoofdmenu")
41 41
 #define MSG_AUTOSTART                       _UxGT("Autostart")
@@ -154,8 +154,8 @@
154 154
 #define MSG_PAUSE_PRINT                     _UxGT("Print pauzeren")
155 155
 #define MSG_RESUME_PRINT                    _UxGT("Print hervatten")
156 156
 #define MSG_STOP_PRINT                      _UxGT("Print stoppen")
157
-#define MSG_CARD_MENU                       _UxGT("Print van SD")
158
-#define MSG_NO_CARD                         _UxGT("Geen SD kaart")
157
+#define MSG_MEDIA_MENU                      _UxGT("Print van SD")
158
+#define MSG_NO_MEDIA                        _UxGT("Geen SD kaart")
159 159
 #define MSG_DWELL                           _UxGT("Slapen...")
160 160
 #define MSG_USERWAIT                        _UxGT("Wachten...")
161 161
 #define MSG_PRINT_ABORTED                   _UxGT("Print afgebroken")
@@ -171,8 +171,8 @@
171 171
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("UnRet  F")
172 172
 #define MSG_AUTORETRACT                     _UxGT("AutoRetr.")
173 173
 #define MSG_FILAMENTCHANGE                  _UxGT("Verv. Filament")
174
-#define MSG_INIT_SDCARD                     _UxGT("Init. SD kaart")
175
-#define MSG_CHANGE_SDCARD                   _UxGT("Verv. SD Kaart")
174
+#define MSG_INIT_MEDIA                      _UxGT("Init. SD kaart")
175
+#define MSG_CHANGE_MEDIA                    _UxGT("Verv. SD Kaart")
176 176
 #define MSG_ZPROBE_OUT                      _UxGT("Z probe uit. bed")
177 177
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Zelf-Test")
178 178
 #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_pl.h Näytä tiedosto

@@ -30,8 +30,8 @@
30 30
 #define CHARSIZE 2
31 31
 
32 32
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gotowy.")
33
-#define MSG_SD_INSERTED                     _UxGT("Karta włożona")
34
-#define MSG_SD_REMOVED                      _UxGT("Karta usunięta")
33
+#define MSG_MEDIA_INSERTED                  _UxGT("Karta włożona")
34
+#define MSG_MEDIA_REMOVED                   _UxGT("Karta usunięta")
35 35
 #define MSG_LCD_ENDSTOPS                    _UxGT("Kranców.") // Max length 8 characters
36 36
 #define MSG_MAIN                            _UxGT("Menu główne")
37 37
 #define MSG_AUTOSTART                       _UxGT("Autostart")
@@ -144,8 +144,8 @@
144 144
 #define MSG_PAUSE_PRINT                     _UxGT("Pauza")
145 145
 #define MSG_RESUME_PRINT                    _UxGT("Wznowienie")
146 146
 #define MSG_STOP_PRINT                      _UxGT("Stop")
147
-#define MSG_CARD_MENU                       _UxGT("Karta SD")
148
-#define MSG_NO_CARD                         _UxGT("Brak karty")
147
+#define MSG_MEDIA_MENU                      _UxGT("Karta SD")
148
+#define MSG_NO_MEDIA                        _UxGT("Brak karty")
149 149
 #define MSG_DWELL                           _UxGT("Uśpij...")
150 150
 #define MSG_USERWAIT                        _UxGT("Oczekiwanie...")
151 151
 #define MSG_PRINT_ABORTED                   _UxGT("Druk przerwany")
@@ -161,8 +161,8 @@
161 161
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT("Cof. wycof.  V")
162 162
 #define MSG_AUTORETRACT                     _UxGT("Auto. wycofanie")
163 163
 #define MSG_FILAMENTCHANGE                  _UxGT("Zmień filament")
164
-#define MSG_INIT_SDCARD                     _UxGT("Inicjal. karty SD")
165
-#define MSG_CHANGE_SDCARD                   _UxGT("Zmiana karty SD")
164
+#define MSG_INIT_MEDIA                      _UxGT("Inicjal. karty SD")
165
+#define MSG_CHANGE_MEDIA                    _UxGT("Zmiana karty SD")
166 166
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z za stołem")
167 167
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Self-Test")
168 168
 #define MSG_BLTOUCH_RESET                   _UxGT("Reset BLTouch")

+ 7
- 7
Marlin/src/lcd/language/language_pt-br.h Näytä tiedosto

@@ -38,8 +38,8 @@
38 38
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
39 39
 
40 40
 #define MSG_BACK                            _UxGT("Voltar")
41
-#define MSG_SD_INSERTED                     _UxGT("Cartão inserido")
42
-#define MSG_SD_REMOVED                      _UxGT("Cartão removido")
41
+#define MSG_MEDIA_INSERTED                  _UxGT("Cartão inserido")
42
+#define MSG_MEDIA_REMOVED                   _UxGT("Cartão removido")
43 43
 #define MSG_LCD_ENDSTOPS                    _UxGT("Fins de curso")
44 44
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Soft Fins curso")
45 45
 #define MSG_MAIN                            _UxGT("Menu principal")
@@ -261,7 +261,7 @@
261 261
 #define MSG_LOAD_EEPROM                     _UxGT("Ler Configuração")
262 262
 #define MSG_RESTORE_FAILSAFE                _UxGT("Restauro seguro")
263 263
 #define MSG_INIT_EEPROM                     _UxGT("Iniciar EEPROM")
264
-#define MSG_SD_UPDATE                       _UxGT("Atualiz. SD")
264
+#define MSG_MEDIA_UPDATE                    _UxGT("Atualiz. SD")
265 265
 #define MSG_RESET_PRINTER                   _UxGT("Resetar Impressora")
266 266
 #define MSG_REFRESH                         _UxGT("Atualização")
267 267
 #define MSG_WATCH                           _UxGT("Informações")
@@ -271,8 +271,8 @@
271 271
 #define MSG_RESUME_PRINT                    _UxGT("Resumir impressão")
272 272
 #define MSG_STOP_PRINT                      _UxGT("Parar impressão")
273 273
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Recuperar Impressão")
274
-#define MSG_CARD_MENU                       _UxGT("Imprimir do SD")
275
-#define MSG_NO_CARD                         _UxGT("Sem cartão SD")
274
+#define MSG_MEDIA_MENU                      _UxGT("Imprimir do SD")
275
+#define MSG_NO_MEDIA                        _UxGT("Sem cartão SD")
276 276
 #define MSG_DWELL                           _UxGT("Dormindo...")
277 277
 #define MSG_USERWAIT                        _UxGT("Clique para retomar")
278 278
 #define MSG_PRINT_PAUSED                    _UxGT("Impressão Pausada")
@@ -299,8 +299,8 @@
299 299
 #define MSG_FILAMENTLOAD                    _UxGT("Carregar Filamento")
300 300
 #define MSG_FILAMENTUNLOAD                  _UxGT("Descarreg. Filamento")
301 301
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Descarregar Todos")
302
-#define MSG_INIT_SDCARD                     _UxGT("Iniciar SD")
303
-#define MSG_CHANGE_SDCARD                   _UxGT("Trocar SD")
302
+#define MSG_INIT_MEDIA                      _UxGT("Iniciar SD")
303
+#define MSG_CHANGE_MEDIA                    _UxGT("Trocar SD")
304 304
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda fora da mesa")
305 305
 #define MSG_SKEW_FACTOR                     _UxGT("Fator de Cisalho")
306 306
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_pt.h Näytä tiedosto

@@ -34,8 +34,8 @@
34 34
 #define CHARSIZE 2
35 35
 
36 36
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronta.")
37
-#define MSG_SD_INSERTED                     _UxGT("Cartão inserido")
38
-#define MSG_SD_REMOVED                      _UxGT("Cartão removido")
37
+#define MSG_MEDIA_INSERTED                  _UxGT("Cartão inserido")
38
+#define MSG_MEDIA_REMOVED                   _UxGT("Cartão removido")
39 39
 #define MSG_MAIN                            _UxGT("Menu principal")
40 40
 #define MSG_AUTOSTART                       _UxGT("Autostart")
41 41
 #define MSG_DISABLE_STEPPERS                _UxGT("Desactivar motores")
@@ -142,8 +142,8 @@
142 142
 #define MSG_PAUSE_PRINT                     _UxGT("Pausar impressão")
143 143
 #define MSG_RESUME_PRINT                    _UxGT("Retomar impressão")
144 144
 #define MSG_STOP_PRINT                      _UxGT("Parar impressão")
145
-#define MSG_CARD_MENU                       _UxGT("Imprimir do SD")
146
-#define MSG_NO_CARD                         _UxGT("Sem cartão SD")
145
+#define MSG_MEDIA_MENU                      _UxGT("Imprimir do SD")
146
+#define MSG_NO_MEDIA                        _UxGT("Sem cartão SD")
147 147
 #define MSG_DWELL                           _UxGT("Em espera...")
148 148
 #define MSG_USERWAIT                        _UxGT("Á espera de ordem")
149 149
 #define MSG_PRINT_ABORTED                   _UxGT("Impressão cancelada")
@@ -159,8 +159,8 @@
159 159
 #define MSG_CONTROL_RETRACT_RECOVERF        _UxGT(" DesRet  V")
160 160
 #define MSG_AUTORETRACT                     _UxGT(" AutoRetr.")
161 161
 #define MSG_FILAMENTCHANGE                  _UxGT("Trocar filamento")
162
-#define MSG_INIT_SDCARD                     _UxGT("Inici. cartão SD")
163
-#define MSG_CHANGE_SDCARD                   _UxGT("Trocar cartão SD")
162
+#define MSG_INIT_MEDIA                      _UxGT("Inici. cartão SD")
163
+#define MSG_CHANGE_MEDIA                    _UxGT("Trocar cartão SD")
164 164
 #define MSG_ZPROBE_OUT                      _UxGT("Sensor fora/base")
165 165
 #define MSG_HOME                            _UxGT("Home")  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
166 166
 #define MSG_FIRST                           _UxGT("first")

+ 9
- 9
Marlin/src/lcd/language/language_ru.h Näytä tiedosto

@@ -34,9 +34,9 @@
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" готов.")
36 36
 #define MSG_BACK                            _UxGT("Назад")
37
-#define MSG_SD_INSERTED                     _UxGT("Карта вставлена")
38
-#define MSG_SD_REMOVED                      _UxGT("Карта извлечена")
39
-#define MSG_SD_RELEASED                     _UxGT("SD карта не активна")
37
+#define MSG_MEDIA_INSERTED                  _UxGT("Карта вставлена")
38
+#define MSG_MEDIA_REMOVED                   _UxGT("Карта извлечена")
39
+#define MSG_MEDIA_RELEASED                  _UxGT("SD карта не активна")
40 40
 #define MSG_LCD_ENDSTOPS                    _UxGT("Эндстопы") // Max length 8 characters
41 41
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Прогр. эндстопы")
42 42
 #define MSG_MAIN                            _UxGT("Меню")
@@ -255,7 +255,7 @@
255 255
 #define MSG_LOAD_EEPROM                     _UxGT("Загрузить настройки")
256 256
 #define MSG_RESTORE_FAILSAFE                _UxGT("Вернуть настройки")
257 257
 #define MSG_INIT_EEPROM                     _UxGT("Инициализация EEPROM")
258
-#define MSG_SD_UPDATE                       _UxGT("Обновление прошивки")
258
+#define MSG_MEDIA_UPDATE                    _UxGT("Обновление прошивки")
259 259
 #define MSG_RESET_PRINTER                   _UxGT("Сброс принтера")
260 260
 #define MSG_REFRESH                         _UxGT("Обновить")
261 261
 #define MSG_WATCH                           _UxGT("Информационный экран")
@@ -273,8 +273,8 @@
273 273
 #define MSG_RESUME_PRINT                    _UxGT("Продолжить печать")
274 274
 #define MSG_STOP_PRINT                      _UxGT("Остановить печать")
275 275
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Восстановение сбоя")
276
-#define MSG_CARD_MENU                       _UxGT("Печать с SD карты")
277
-#define MSG_NO_CARD                         _UxGT("Нет SD карты")
276
+#define MSG_MEDIA_MENU                      _UxGT("Печать с SD карты")
277
+#define MSG_NO_MEDIA                        _UxGT("Нет SD карты")
278 278
 #define MSG_DWELL                           _UxGT("Сон...")
279 279
 #define MSG_USERWAIT                        _UxGT("Продолжить...")
280 280
 #define MSG_PRINT_PAUSED                    _UxGT("Печать на паузе")
@@ -303,9 +303,9 @@
303 303
 #define MSG_FILAMENTLOAD                    _UxGT("Загрузка филамента")
304 304
 #define MSG_FILAMENTUNLOAD                  _UxGT("Выгрузка филамента")
305 305
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Выгрузить всё")
306
-#define MSG_INIT_SDCARD                     _UxGT("Активировать SD")
307
-#define MSG_CHANGE_SDCARD                   _UxGT("Сменить SD карту")
308
-#define MSG_RELEASE_SDCARD                  _UxGT("Деактивировать SD")
306
+#define MSG_INIT_MEDIA                      _UxGT("Активировать SD")
307
+#define MSG_CHANGE_MEDIA                    _UxGT("Сменить SD карту")
308
+#define MSG_RELEASE_MEDIA                   _UxGT("Деактивировать SD")
309 309
 #define MSG_ZPROBE_OUT                      _UxGT("Z датчик вне стола")
310 310
 #define MSG_SKEW_FACTOR                     _UxGT("Фактор наклона")
311 311
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 9
- 9
Marlin/src/lcd/language/language_sk.h Näytä tiedosto

@@ -43,9 +43,9 @@
43 43
 #define MSG_YES                             _UxGT("ÁNO")
44 44
 #define MSG_NO                              _UxGT("NIE")
45 45
 #define MSG_BACK                            _UxGT("Naspäť")
46
-#define MSG_SD_INSERTED                     _UxGT("Karta vložená")
47
-#define MSG_SD_REMOVED                      _UxGT("Karta vybraná")
48
-#define MSG_SD_RELEASED                     _UxGT("Karta odpojená")
46
+#define MSG_MEDIA_INSERTED                  _UxGT("Karta vložená")
47
+#define MSG_MEDIA_REMOVED                   _UxGT("Karta vybraná")
48
+#define MSG_MEDIA_RELEASED                  _UxGT("Karta odpojená")
49 49
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstopy") // max 8 znakov
50 50
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Soft. endstopy")
51 51
 #define MSG_MAIN                            _UxGT("Hlavná ponuka")
@@ -281,7 +281,7 @@
281 281
 #define MSG_LOAD_EEPROM                     _UxGT("Načítať nastavenie")
282 282
 #define MSG_RESTORE_FAILSAFE                _UxGT("Obnoviť nastavenie")
283 283
 #define MSG_INIT_EEPROM                     _UxGT("Inicializ. EEPROM")
284
-#define MSG_SD_UPDATE                       _UxGT("Aktualizovať z SD")
284
+#define MSG_MEDIA_UPDATE                    _UxGT("Aktualizovať z SD")
285 285
 #define MSG_RESET_PRINTER                   _UxGT("Reštart. tlačiar.")
286 286
 #define MSG_REFRESH                         _UxGT("Obnoviť")
287 287
 #define MSG_WATCH                           _UxGT("Info. obrazovka")
@@ -299,8 +299,8 @@
299 299
 #define MSG_RESUME_PRINT                    _UxGT("Obnoviť tlač")
300 300
 #define MSG_STOP_PRINT                      _UxGT("Zastaviť tlač")
301 301
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Obnova po výp. nap.")
302
-#define MSG_CARD_MENU                       _UxGT("Tlačiť z SD")
303
-#define MSG_NO_CARD                         _UxGT("Žiadna SD karta")
302
+#define MSG_MEDIA_MENU                      _UxGT("Tlačiť z SD")
303
+#define MSG_NO_MEDIA                        _UxGT("Žiadna SD karta")
304 304
 #define MSG_DWELL                           _UxGT("Spím...")
305 305
 #define MSG_USERWAIT                        _UxGT("Pokrač. kliknutím...")
306 306
 #define MSG_PRINT_PAUSED                    _UxGT("Tlač pozastavená")
@@ -329,9 +329,9 @@
329 329
 #define MSG_FILAMENTUNLOAD                  _UxGT("Vysunúť filament")
330 330
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Vysunúť všetko")
331 331
 
332
-#define MSG_INIT_SDCARD                     _UxGT("Načítať SD kartu")
333
-#define MSG_CHANGE_SDCARD                   _UxGT("Vymeniť SD kartu")
334
-#define MSG_RELEASE_SDCARD                  _UxGT("Odpojiť SD kartu")
332
+#define MSG_INIT_MEDIA                      _UxGT("Načítať SD kartu")
333
+#define MSG_CHANGE_MEDIA                    _UxGT("Vymeniť SD kartu")
334
+#define MSG_RELEASE_MEDIA                   _UxGT("Odpojiť SD kartu")
335 335
 #define MSG_ZPROBE_OUT                      _UxGT("Sonda Z mimo podl.")
336 336
 #define MSG_SKEW_FACTOR                     _UxGT("Faktor skosenia")
337 337
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 8
- 8
Marlin/src/lcd/language/language_tr.h Näytä tiedosto

@@ -1,4 +1,4 @@
1
-/**
1
+ /**
2 2
  * Marlin 3D Printer Firmware
3 3
  * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4 4
  *
@@ -39,8 +39,8 @@
39 39
 
40 40
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" hazır.")
41 41
 #define MSG_BACK                            _UxGT("Geri")
42
-#define MSG_SD_INSERTED                     _UxGT("SD K. Yerleştirildi.")
43
-#define MSG_SD_REMOVED                      _UxGT("SD Kart Çıkarıldı.")
42
+#define MSG_MEDIA_INSERTED                  _UxGT("SD K. Yerleştirildi.")
43
+#define MSG_MEDIA_REMOVED                   _UxGT("SD Kart Çıkarıldı.")
44 44
 #define MSG_LCD_ENDSTOPS                    _UxGT("Enstops") // Max length 8 characters
45 45
 #define MSG_LCD_SOFT_ENDSTOPS               _UxGT("Yazılımsal Endstops")
46 46
 #define MSG_MAIN                            _UxGT("Ana")
@@ -260,7 +260,7 @@
260 260
 #define MSG_LOAD_EEPROM                     _UxGT("Hafızadan Yükle")
261 261
 #define MSG_RESTORE_FAILSAFE                _UxGT("Fabrika Ayarları")
262 262
 #define MSG_INIT_EEPROM                     _UxGT("EEPROM'u başlat")
263
-#define MSG_SD_UPDATE                       _UxGT("SD Güncellemesi")
263
+#define MSG_MEDIA_UPDATE                    _UxGT("SD Güncellemesi")
264 264
 #define MSG_RESET_PRINTER                   _UxGT("Yazıcıyı Resetle")
265 265
 #define MSG_REFRESH                         _UxGT("Yenile")
266 266
 #define MSG_WATCH                           _UxGT("Bilgi Ekranı")
@@ -270,8 +270,8 @@
270 270
 #define MSG_RESUME_PRINT                    _UxGT("Sürdür")
271 271
 #define MSG_STOP_PRINT                      _UxGT("Durdur")
272 272
 #define MSG_OUTAGE_RECOVERY                 _UxGT("Kesinti Kurtarma")
273
-#define MSG_CARD_MENU                       _UxGT("SD Karttan Yazdır")
274
-#define MSG_NO_CARD                         _UxGT("SD Kart Yok!")
273
+#define MSG_MEDIA_MENU                      _UxGT("SD Karttan Yazdır")
274
+#define MSG_NO_MEDIA                        _UxGT("SD Kart Yok!")
275 275
 #define MSG_DWELL                           _UxGT("Uyku...")
276 276
 #define MSG_USERWAIT                        _UxGT("Operatör bekleniyor.")
277 277
 #define MSG_PRINT_PAUSED                    _UxGT("Baskı Duraklatıldı")
@@ -298,8 +298,8 @@
298 298
 #define MSG_FILAMENTLOAD                    _UxGT("Filaman Yükle")
299 299
 #define MSG_FILAMENTUNLOAD                  _UxGT("Filaman Çıkart")
300 300
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("Tümünü Çıkart")
301
-#define MSG_INIT_SDCARD                     _UxGT("SD Kart Başlatılıyor")
302
-#define MSG_CHANGE_SDCARD                   _UxGT("SD Kart Değiştir")
301
+#define MSG_INIT_MEDIA                      _UxGT("SD Kart Başlatılıyor")
302
+#define MSG_CHANGE_MEDIA                    _UxGT("SD Kart Değiştir")
303 303
 #define MSG_ZPROBE_OUT                      _UxGT("Z Prob Açık. Tabla")
304 304
 #define MSG_SKEW_FACTOR                     _UxGT("Çarpıklık Faktörü")
305 305
 #define MSG_BLTOUCH                         _UxGT("BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_uk.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 #define CHARSIZE 2
34 34
 
35 35
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" готовий.")
36
-#define MSG_SD_INSERTED                     _UxGT("Картка вставлена")
37
-#define MSG_SD_REMOVED                      _UxGT("Картка видалена")
36
+#define MSG_MEDIA_INSERTED                  _UxGT("Картка вставлена")
37
+#define MSG_MEDIA_REMOVED                   _UxGT("Картка видалена")
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("Кінцевик") // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("Меню")
40 40
 #define MSG_AUTOSTART                       _UxGT("Автостарт")
@@ -145,8 +145,8 @@
145 145
 #define MSG_PAUSE_PRINT                     _UxGT("Призупинити друк")
146 146
 #define MSG_RESUME_PRINT                    _UxGT("Відновити друк")
147 147
 #define MSG_STOP_PRINT                      _UxGT("Скасувати друк")
148
-#define MSG_CARD_MENU                       _UxGT("Друкувати з SD")
149
-#define MSG_NO_CARD                         _UxGT("Відсутня SD карт.")
148
+#define MSG_MEDIA_MENU                      _UxGT("Друкувати з SD")
149
+#define MSG_NO_MEDIA                        _UxGT("Відсутня SD карт.")
150 150
 #define MSG_DWELL                           _UxGT("Сплячка...")
151 151
 #define MSG_USERWAIT                        _UxGT("Очікування дій...")
152 152
 #define MSG_PRINT_ABORTED                   _UxGT("Друк скасовано")
@@ -154,8 +154,8 @@
154 154
 #define MSG_KILLED                          _UxGT("ПЕРЕРВАНО. ")
155 155
 #define MSG_STOPPED                         _UxGT("ЗУПИНЕНО. ")
156 156
 #define MSG_FILAMENTCHANGE                  _UxGT("Зміна волокна")
157
-#define MSG_INIT_SDCARD                     _UxGT("Старт SD картки")
158
-#define MSG_CHANGE_SDCARD                   _UxGT("Заміна SD карти")
157
+#define MSG_INIT_MEDIA                      _UxGT("Старт SD картки")
158
+#define MSG_CHANGE_MEDIA                    _UxGT("Заміна SD карти")
159 159
 #define MSG_ZPROBE_OUT                      _UxGT("Z дет. не в межах")
160 160
 #define MSG_BLTOUCH_SELFTEST                _UxGT("BLTouch Само-Тест")
161 161
 #define MSG_BLTOUCH_RESET                   _UxGT("Скинути BLTouch")

+ 6
- 6
Marlin/src/lcd/language/language_zh_CN.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 
34 34
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就绪.")  //" ready."
35 35
 #define MSG_BACK                            _UxGT("返回")         // ”Back“
36
-#define MSG_SD_INSERTED                     _UxGT("存储卡已插入")  //"Card inserted"
37
-#define MSG_SD_REMOVED                      _UxGT("存储卡被拔出")  //"Card removed"
36
+#define MSG_MEDIA_INSERTED                  _UxGT("存储卡已插入")  //"Card inserted"
37
+#define MSG_MEDIA_REMOVED                   _UxGT("存储卡被拔出")  //"Card removed"
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("挡块")  //"Endstops" // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("主菜单")  //"Main"
40 40
 #define MSG_AUTOSTART                       _UxGT("自动开始")  //"Autostart"
@@ -243,8 +243,8 @@
243 243
 #define MSG_PAUSE_PRINT                     _UxGT("暂停打印")  //"Pause print"
244 244
 #define MSG_RESUME_PRINT                    _UxGT("恢复打印")  //"Resume print"
245 245
 #define MSG_STOP_PRINT                      _UxGT("停止打印")  //"Stop print"
246
-#define MSG_CARD_MENU                       _UxGT("从存储卡上打印")  //"Print from SD"
247
-#define MSG_NO_CARD                         _UxGT("无存储卡")  //"No SD card"
246
+#define MSG_MEDIA_MENU                      _UxGT("从存储卡上打印")  //"Print from SD"
247
+#define MSG_NO_MEDIA                        _UxGT("无存储卡")  //"No SD card"
248 248
 #define MSG_DWELL                           _UxGT("休眠中 ...")  //"Sleep..."
249 249
 #define MSG_USERWAIT                        _UxGT("点击继续 ...")  //"Click to resume..."
250 250
 #define MSG_PRINT_PAUSED                    _UxGT("暫停打印") // "Print paused"
@@ -265,8 +265,8 @@
265 265
 #define MSG_FILAMENTLOAD                    _UxGT("装载丝料") // "Load filament"
266 266
 #define MSG_FILAMENTUNLOAD                  _UxGT("卸载丝料") // "Unload filament"
267 267
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("卸载全部") // "Unload All"
268
-#define MSG_INIT_SDCARD                     _UxGT("初始化存储卡")  //"Init. SD card"
269
-#define MSG_CHANGE_SDCARD                   _UxGT("更换存储卡")  //"Change SD card"
268
+#define MSG_INIT_MEDIA                      _UxGT("初始化存储卡")  //"Init. SD card"
269
+#define MSG_CHANGE_MEDIA                    _UxGT("更换存储卡")  //"Change SD card"
270 270
 #define MSG_ZPROBE_OUT                      _UxGT("Z探针在热床之外")  //"Z probe out. bed" Z probe is not within the physical limits
271 271
 #define MSG_SKEW_FACTOR                     _UxGT("偏斜因数") // "Skew Factor"
272 272
 #define MSG_BLTOUCH                         _UxGT("BLTouch")     // "BLTouch"

+ 6
- 6
Marlin/src/lcd/language/language_zh_TW.h Näytä tiedosto

@@ -33,8 +33,8 @@
33 33
 
34 34
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就緒.")  //" ready."
35 35
 #define MSG_BACK                            _UxGT("返回")         // ”Back“
36
-#define MSG_SD_INSERTED                     _UxGT("記憶卡已插入")  //"Card inserted"
37
-#define MSG_SD_REMOVED                      _UxGT("記憶卡被拔出")  //"Card removed"
36
+#define MSG_MEDIA_INSERTED                  _UxGT("記憶卡已插入")  //"Card inserted"
37
+#define MSG_MEDIA_REMOVED                   _UxGT("記憶卡被拔出")  //"Card removed"
38 38
 #define MSG_LCD_ENDSTOPS                    _UxGT("擋塊")  //"Endstops" // Max length 8 characters
39 39
 #define MSG_MAIN                            _UxGT("主選單")  //"Main"
40 40
 #define MSG_AUTOSTART                       _UxGT("自動開始")  //"Autostart"
@@ -243,8 +243,8 @@
243 243
 #define MSG_PAUSE_PRINT                     _UxGT("暫停列印")  //"Pause print"
244 244
 #define MSG_RESUME_PRINT                    _UxGT("恢復列印")  //"Resume print"
245 245
 #define MSG_STOP_PRINT                      _UxGT("停止列印")  //"Stop print"
246
-#define MSG_CARD_MENU                       _UxGT("從記憶卡上列印")  //"Print from SD"
247
-#define MSG_NO_CARD                         _UxGT("無記憶卡")  //"No SD card"
246
+#define MSG_MEDIA_MENU                      _UxGT("從記憶卡上列印")  //"Print from SD"
247
+#define MSG_NO_MEDIA                        _UxGT("無記憶卡")  //"No SD card"
248 248
 #define MSG_DWELL                           _UxGT("休眠 ...")  //"Sleep..."
249 249
 #define MSG_USERWAIT                        _UxGT("點擊繼續 ...")  //"Click to resume..."
250 250
 #define MSG_PRINT_PAUSED                    _UxGT("列印已暫停") // "Print paused"
@@ -265,8 +265,8 @@
265 265
 #define MSG_FILAMENTLOAD                    _UxGT("裝載絲料") // "Load filament"
266 266
 #define MSG_FILAMENTUNLOAD                  _UxGT("卸載絲料") // "Unload filament"
267 267
 #define MSG_FILAMENTUNLOAD_ALL              _UxGT("卸載全部") // "Unload All"
268
-#define MSG_INIT_SDCARD                     _UxGT("初始化記憶卡")  //"Init. SD card"
269
-#define MSG_CHANGE_SDCARD                   _UxGT("更換記憶卡")  //"Change SD card"
268
+#define MSG_INIT_MEDIA                      _UxGT("初始化記憶卡")  //"Init. SD card"
269
+#define MSG_CHANGE_MEDIA                    _UxGT("更換記憶卡")  //"Change SD card"
270 270
 #define MSG_ZPROBE_OUT                      _UxGT("Z探針在熱床之外")  //"Z probe out. bed" Z probe is not within the physical limits
271 271
 #define MSG_SKEW_FACTOR                     _UxGT("偏斜因數") // "Skew Factor"
272 272
 #define MSG_BLTOUCH                         _UxGT("BLTouch")     // "BLTouch"

+ 1
- 1
Marlin/src/lcd/menu/menu.h Näytä tiedosto

@@ -351,7 +351,7 @@ void menu_main();
351 351
 void menu_move();
352 352
 
353 353
 #if ENABLED(SDSUPPORT)
354
-  void menu_sdcard();
354
+  void menu_media();
355 355
 #endif
356 356
 
357 357
 // First Fan Speed title in "Tune" and "Control>Temperature" menus

+ 1
- 1
Marlin/src/lcd/menu/menu_advanced.cpp Näytä tiedosto

@@ -699,7 +699,7 @@ void menu_advanced_settings() {
699 699
 
700 700
   #if ENABLED(SD_FIRMWARE_UPDATE)
701 701
     bool sd_update_state = settings.sd_update_status();
702
-    MENU_ITEM_EDIT_CALLBACK(bool, MSG_SD_UPDATE, &sd_update_state, []{
702
+    MENU_ITEM_EDIT_CALLBACK(bool, MSG_MEDIA_UPDATE, &sd_update_state, []{
703 703
       //
704 704
       // Toggle the SD Firmware Update state in EEPROM
705 705
       //

+ 12
- 12
Marlin/src/lcd/menu/menu_main.cpp Näytä tiedosto

@@ -126,22 +126,22 @@ void menu_main() {
126 126
 
127 127
       if (card_detected) {
128 128
         if (!card_open) {
129
-          MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
129
+          MENU_ITEM(submenu, MSG_MEDIA_MENU, menu_media);
130 130
           MENU_ITEM(gcode,
131 131
             #if PIN_EXISTS(SD_DETECT)
132
-              MSG_CHANGE_SDCARD, PSTR("M21")
132
+              MSG_CHANGE_MEDIA, PSTR("M21")
133 133
             #else
134
-              MSG_RELEASE_SDCARD, PSTR("M22")
134
+              MSG_RELEASE_MEDIA, PSTR("M22")
135 135
             #endif
136 136
           );
137 137
         }
138 138
       }
139 139
       else {
140 140
         #if PIN_EXISTS(SD_DETECT)
141
-          MENU_ITEM(function, MSG_NO_CARD, nullptr);
141
+          MENU_ITEM(function, MSG_NO_MEDIA, nullptr);
142 142
         #else
143
-          MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
144
-          MENU_ITEM(function, MSG_SD_RELEASED, nullptr);
143
+          MENU_ITEM(gcode, MSG_INIT_MEDIA, PSTR("M21"));
144
+          MENU_ITEM(function, MSG_MEDIA_RELEASED, nullptr);
145 145
         #endif
146 146
       }
147 147
     #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
@@ -219,20 +219,20 @@ void menu_main() {
219 219
       if (!card_open) {
220 220
         MENU_ITEM(gcode,
221 221
           #if PIN_EXISTS(SD_DETECT)
222
-            MSG_CHANGE_SDCARD, PSTR("M21")
222
+            MSG_CHANGE_MEDIA, PSTR("M21")
223 223
           #else
224
-            MSG_RELEASE_SDCARD, PSTR("M22")
224
+            MSG_RELEASE_MEDIA, PSTR("M22")
225 225
           #endif
226 226
         );
227
-        MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
227
+        MENU_ITEM(submenu, MSG_MEDIA_MENU, menu_media);
228 228
       }
229 229
     }
230 230
     else {
231 231
       #if PIN_EXISTS(SD_DETECT)
232
-        MENU_ITEM(function, MSG_NO_CARD, nullptr);
232
+        MENU_ITEM(function, MSG_NO_MEDIA, nullptr);
233 233
       #else
234
-        MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21"));
235
-        MENU_ITEM(function, MSG_SD_RELEASED, nullptr);
234
+        MENU_ITEM(gcode, MSG_INIT_MEDIA, PSTR("M21"));
235
+        MENU_ITEM(function, MSG_MEDIA_RELEASED, nullptr);
236 236
       #endif
237 237
     }
238 238
   #endif // HAS_ENCODER_WHEEL && SDSUPPORT

Marlin/src/lcd/menu/menu_sdcard.cpp → Marlin/src/lcd/menu/menu_media.cpp Näytä tiedosto

@@ -62,7 +62,7 @@ void lcd_sd_updir() {
62 62
     //  ui.drawing_screen = screen_changed = true;
63 63
     //#endif
64 64
 
65
-    goto_screen(menu_sdcard, sd_encoder_position, sd_top_line, sd_items);
65
+    goto_screen(menu_media, sd_encoder_position, sd_top_line, sd_items);
66 66
     sd_encoder_position = 0xFFFF;
67 67
 
68 68
     defer_status_screen();
@@ -122,7 +122,7 @@ class MenuItem_sdfolder {
122 122
     }
123 123
 };
124 124
 
125
-void menu_sdcard() {
125
+void menu_media() {
126 126
   ui.encoder_direction_menus();
127 127
 
128 128
   const uint16_t fileCnt = card.get_num_Files();
@@ -149,9 +149,9 @@ void menu_sdcard() {
149 149
       card.getfilename_sorted(nr);
150 150
 
151 151
       if (card.flag.filenameIsDir)
152
-        MENU_ITEM(sdfolder, MSG_CARD_MENU, card);
152
+        MENU_ITEM(sdfolder, MSG_MEDIA_MENU, card);
153 153
       else
154
-        MENU_ITEM(sdfile, MSG_CARD_MENU, card);
154
+        MENU_ITEM(sdfile, MSG_MEDIA_MENU, card);
155 155
     }
156 156
     else {
157 157
       MENU_ITEM_DUMMY();

+ 3
- 3
Marlin/src/lcd/ultralcd.cpp Näytä tiedosto

@@ -828,13 +828,13 @@ void MarlinUI::update() {
828 828
         if (old_sd_status == 2)
829 829
           card.beginautostart();  // Initial boot
830 830
         else
831
-          set_status_P(PSTR(MSG_SD_INSERTED));
831
+          set_status_P(PSTR(MSG_MEDIA_INSERTED));
832 832
       }
833 833
       #if PIN_EXISTS(SD_DETECT)
834 834
         else {
835 835
           card.release();
836 836
           if (old_sd_status != 2) {
837
-            set_status_P(PSTR(MSG_SD_REMOVED));
837
+            set_status_P(PSTR(MSG_MEDIA_REMOVED));
838 838
             #if HAS_LCD_MENU
839 839
               return_to_status();
840 840
             #endif
@@ -967,7 +967,7 @@ void MarlinUI::update() {
967 967
     #if HAS_LCD_MENU && ENABLED(SCROLL_LONG_FILENAMES)
968 968
       // If scrolling of long file names is enabled and we are in the sd card menu,
969 969
       // cause a refresh to occur until all the text has scrolled into view.
970
-      if (currentScreen == menu_sdcard && !lcd_status_update_delay--) {
970
+      if (currentScreen == menu_media && !lcd_status_update_delay--) {
971 971
         lcd_status_update_delay = 4;
972 972
         if (++filename_scroll_pos > filename_scroll_max) {
973 973
           filename_scroll_pos = 0;

Loading…
Peruuta
Tallenna