Browse Source

🚸 Change "SD" to "Media" or "SD/FD" (#23297)

Robby Candra 2 years ago
parent
commit
e57b7d043c
No account linked to committer's email address

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h View File

@@ -123,12 +123,12 @@
123 123
    *     10         5V      5V      5V      -->  KILL [3]
124 124
    *
125 125
    * [1] This configuration allows daisy-chaining of the
126
-   *     display and SD/USB on EXP2, except for [2]
126
+   *     display and SD/FD on EXP2, except for [2]
127 127
    *
128 128
    * [2] The Ultimachine Einsy boards have a level shifter
129 129
    *     on MISO enabled by SD_CSEL chip select, hence it
130 130
    *     is not possible to run both the display and the
131
-   *     SD/USB on EXP2.
131
+   *     SD/FD on EXP2.
132 132
    *
133 133
    * [3] Archim Rambo provides 5V on this pin. On any other
134 134
    *     board, divert this wire from the ribbon cable and

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

@@ -42,7 +42,7 @@ namespace Language_de {
42 42
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Medium erkannt");
43 43
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Medium entfernt");
44 44
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Warten auf Medium");
45
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init fehlgesch.");
45
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Medium Init fehlgesch.");
46 46
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Medium Lesefehler");
47 47
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB Gerät entfernt");
48 48
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB Start fehlge.");

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

@@ -50,7 +50,7 @@ namespace Language_el {
50 50
   LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" σφάλμα ανάγνωσης");
51 51
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB αφαιρέθη");
52 52
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Αποτυχία εκκίνησης USB");
53
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Αποτυχία αρχικοποίησης SD");
53
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Αποτυχία αρχικοποίησης SD");
54 54
   LSTR MSG_MAIN                           = _UxGT("Αρχική Οθόνη");
55 55
   LSTR MSG_RUN_AUTO_FILES                 = _UxGT("Αυτόματη εκκίνηση");
56 56
   LSTR MSG_DISABLE_STEPPERS               = _UxGT("Απενεργοποίηση μοτέρ");

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

@@ -57,8 +57,8 @@ namespace Language_en {
57 57
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Aborting...");
58 58
   LSTR MSG_MEDIA_INSERTED                 = MEDIA_TYPE_EN _UxGT(" Inserted");
59 59
   LSTR MSG_MEDIA_REMOVED                  = MEDIA_TYPE_EN _UxGT(" Removed");
60
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Waiting for card");
61
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD Init Fail");
60
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Waiting for ") MEDIA_TYPE_EN;
61
+  LSTR MSG_MEDIA_INIT_FAIL                = MEDIA_TYPE_EN _UxGT(" Init Fail");
62 62
   LSTR MSG_MEDIA_READ_ERROR               = MEDIA_TYPE_EN _UxGT(" read error");
63 63
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB device removed");
64 64
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start failed");

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

@@ -39,11 +39,11 @@ namespace Language_es {
39 39
   LSTR MSG_NO                             = _UxGT("NO");
40 40
   LSTR MSG_BACK                           = _UxGT("Atrás");
41 41
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
42
-  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD/USB insertado");
43
-  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD/USB retirado");
44
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Esperando al SD/USB");
45
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Fallo al iniciar SD");
46
-  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Error lectura SD/USB");
42
+  LSTR MSG_MEDIA_INSERTED                 = _UxGT("SD/FD insertado");
43
+  LSTR MSG_MEDIA_REMOVED                  = _UxGT("SD/FD retirado");
44
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Esperando al SD/FD");
45
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Fallo al iniciar SD/FD");
46
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Error lectura SD/FD");
47 47
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
48 48
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
49 49
   LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbordamiento de subllamada");
@@ -325,7 +325,7 @@ namespace Language_es {
325 325
   LSTR MSG_ERR_EEPROM_CRC                 = _UxGT("Err: EEPROM CRC");
326 326
   LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Err: Índice EEPROM");
327 327
   LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Err: Versión EEPROM");
328
-  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
328
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/FD");
329 329
   LSTR MSG_RESET_PRINTER                  = _UxGT("Resetear Impresora");
330 330
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
331 331
   LSTR MSG_INFO_SCREEN                    = _UxGT("Pantalla de Inf.");
@@ -348,8 +348,8 @@ namespace Language_es {
348 348
   LSTR MSG_CANCEL_OBJECT                  = _UxGT("Cancelar Objeto");
349 349
   LSTR MSG_CANCEL_OBJECT_N                = _UxGT("Cancelar Objeto =");
350 350
   LSTR MSG_OUTAGE_RECOVERY                = _UxGT("Rec. Fallo electrico");
351
-  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/USB");
352
-  LSTR MSG_NO_MEDIA                       = _UxGT("SD/USB no presente");
351
+  LSTR MSG_MEDIA_MENU                     = _UxGT("Imprim. desde SD/FD");
352
+  LSTR MSG_NO_MEDIA                       = _UxGT("SD/FD no presente");
353 353
   LSTR MSG_DWELL                          = _UxGT("Reposo...");
354 354
   LSTR MSG_USERWAIT                       = _UxGT("Pulsar para Reanudar");
355 355
   LSTR MSG_PRINT_PAUSED                   = _UxGT("Impresión Pausada");
@@ -381,9 +381,9 @@ namespace Language_es {
381 381
   LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar filamento");
382 382
   LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar fil. *");
383 383
   LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar todo");
384
-  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
385
-  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
386
-  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
384
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/FD");
385
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/FD");
386
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/FD");
387 387
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda Z fuera cama");
388 388
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de desviación");
389 389
   LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");

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

@@ -43,8 +43,8 @@ namespace Language_gl {
43 43
   LSTR MSG_MEDIA_ABORTING                 = _UxGT("Cancelando...");
44 44
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tarxeta inserida");
45 45
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tarxeta retirada");
46
-  LSTR MSG_MEDIA_WAITING                  = _UxGT("Agardando ao SD/USB");
47
-  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro lectura SD/USB");
46
+  LSTR MSG_MEDIA_WAITING                  = _UxGT("Agardando ao SD/FD");
47
+  LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Erro lectura SD/FD");
48 48
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Disp. USB retirado");
49 49
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Inicio USB fallido");
50 50
   LSTR MSG_KILL_SUBCALL_OVERFLOW          = _UxGT("Desbord. Subch.");
@@ -329,7 +329,7 @@ namespace Language_gl {
329 329
   LSTR MSG_ERR_EEPROM_INDEX               = _UxGT("Erro: Índice EEPROM");
330 330
   LSTR MSG_ERR_EEPROM_VERSION             = _UxGT("Erro: Versión EEPROM");
331 331
   LSTR MSG_SETTINGS_STORED                = _UxGT("Config Gardada");
332
-  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/USB");
332
+  LSTR MSG_MEDIA_UPDATE                   = _UxGT("Actualizar SD/FD");
333 333
   LSTR MSG_RESET_PRINTER                  = _UxGT("Reiniciar Impresora");
334 334
   LSTR MSG_REFRESH                        = LCD_STR_REFRESH  _UxGT("Recargar");
335 335
   LSTR MSG_INFO_SCREEN                    = _UxGT("Información");
@@ -397,9 +397,9 @@ namespace Language_gl {
397 397
   LSTR MSG_FILAMENTUNLOAD                 = _UxGT("Descargar Filamento");
398 398
   LSTR MSG_FILAMENTUNLOAD_E               = _UxGT("Descargar Filamento *");
399 399
   LSTR MSG_FILAMENTUNLOAD_ALL             = _UxGT("Descargar Todo");
400
-  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/USB");
401
-  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/USB");
402
-  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/USB");
400
+  LSTR MSG_ATTACH_MEDIA                   = _UxGT("Iniciar SD/FD");
401
+  LSTR MSG_CHANGE_MEDIA                   = _UxGT("Cambiar SD/FD");
402
+  LSTR MSG_RELEASE_MEDIA                  = _UxGT("Lanzar SD/FD");
403 403
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Sonda-Z fóra Cama");
404 404
   LSTR MSG_SKEW_FACTOR                    = _UxGT("Factor de Desviación");
405 405
   LSTR MSG_BLTOUCH                        = _UxGT("BLTouch");

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

@@ -47,7 +47,7 @@ namespace Language_hu {
47 47
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Tároló behelyezve");
48 48
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Tároló eltávolítva");
49 49
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Várakozás a tárolóra");
50
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD-kártya hiba");
50
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Tároló-kártya hiba");
51 51
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Tároló olvasási hiba");
52 52
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB eltávolítva");
53 53
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB eszköz hiba");

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

@@ -53,7 +53,7 @@ namespace Language_it {
53 53
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media inserito");
54 54
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media rimosso");
55 55
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Aspettando media");
56
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inizial.SD fallita");
56
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Iniz.Media fallita");
57 57
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Err.leggendo media");
58 58
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Dispos.USB rimosso");
59 59
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Avvio USB fallito");

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

@@ -53,7 +53,7 @@ namespace Language_pl {
53 53
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta włożona");
54 54
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta usunięta");
55 55
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Oczekiwanie na kartę");
56
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Błąd inicializacji karty");
56
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Błąd inicializacji karty");
57 57
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Bład odczytu karty");
58 58
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("Urządzenie USB usunięte");
59 59
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Błąd uruchomienia USB");

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

@@ -44,9 +44,9 @@ namespace Language_ru {
44 44
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD карта извлечена");
45 45
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставьте SD карту");
46 46
   #if LCD_WIDTH > 21
47
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализации SD");
47
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализации SD");
48 48
   #else
49
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Сбой инициализ. SD");
49
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Сбой инициализ. SD");
50 50
   #endif
51 51
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Ошибка считывания");
52 52
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск удалён");

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

@@ -56,7 +56,7 @@ namespace Language_sk {
56 56
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Karta vložená");
57 57
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Karta vybraná");
58 58
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Čakám na kartu");
59
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("Inicial. SD zlyhala");
59
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Inicial. SD zlyhala");
60 60
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Chyba čítania karty");
61 61
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB zaria. odstrán.");
62 62
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("Chyba spúšťania USB");

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

@@ -44,7 +44,7 @@ namespace Language_sv {
44 44
   LSTR MSG_MEDIA_INSERTED                 = _UxGT("Media Instatt");
45 45
   LSTR MSG_MEDIA_REMOVED                  = _UxGT("Media Borttaget");
46 46
   LSTR MSG_MEDIA_WAITING                  = _UxGT("Väntar på media");
47
-  LSTR MSG_SD_INIT_FAIL                   = _UxGT("SD init misslyckades");
47
+  LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Media init misslyckades");
48 48
   LSTR MSG_MEDIA_READ_ERROR               = _UxGT("Media läsningsfel");
49 49
   LSTR MSG_MEDIA_USB_REMOVED              = _UxGT("USB enhet borttagen");
50 50
   LSTR MSG_MEDIA_USB_FAILED               = _UxGT("USB start misslyckad");

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

@@ -45,9 +45,9 @@ namespace Language_uk {
45 45
   LSTR MSG_MEDIA_REMOVED                    = _UxGT("SD-картка видалена");
46 46
   LSTR MSG_MEDIA_WAITING                    = _UxGT("Вставте SD-картку");
47 47
   #if LCD_WIDTH > 21
48
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціалізації SD");
48
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціалізації SD");
49 49
   #else
50
-    LSTR MSG_SD_INIT_FAIL                   = _UxGT("Збій ініціаліз. SD");
50
+    LSTR MSG_MEDIA_INIT_FAIL                = _UxGT("Збій ініціаліз. SD");
51 51
   #endif
52 52
   LSTR MSG_MEDIA_READ_ERROR                 = _UxGT("Помилка зчитування");
53 53
   LSTR MSG_MEDIA_USB_REMOVED                = _UxGT("USB диск видалений");

+ 1
- 1
Marlin/src/sd/cardreader.cpp View File

@@ -457,7 +457,7 @@ void CardReader::mount() {
457 457
     cdroot();
458 458
   #if ENABLED(USB_FLASH_DRIVE_SUPPORT) || PIN_EXISTS(SD_DETECT)
459 459
     else if (marlin_state != MF_INITIALIZING)
460
-      ui.set_status(GET_TEXT_F(MSG_SD_INIT_FAIL), -1);
460
+      ui.set_status(GET_TEXT_F(MSG_MEDIA_INIT_FAIL), -1);
461 461
   #endif
462 462
 
463 463
   ui.refresh();

Loading…
Cancel
Save