melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
x301
Robby Candra 3 years ago committed by Scott Lahteine
parent 570c7e8638
commit d2c7104bb3
14 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/pin_mappings.h
Unescape Escape View File

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

2
Marlin/src/lcd/language/language_de.h
Unescape Escape View File

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

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

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

4
Marlin/src/lcd/language/language_en.h
Unescape Escape View File

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

22
Marlin/src/lcd/language/language_es.h
Unescape Escape View File

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

12
Marlin/src/lcd/language/language_gl.h
Unescape Escape View File

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

2
Marlin/src/lcd/language/language_hu.h
Unescape Escape View File

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

2
Marlin/src/lcd/language/language_it.h
Unescape Escape View File

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

2
Marlin/src/lcd/language/language_pl.h
Unescape Escape View File

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

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

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

2
Marlin/src/lcd/language/language_sk.h
Unescape Escape View File

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

2
Marlin/src/lcd/language/language_sv.h
Unescape Escape View File

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

4
Marlin/src/lcd/language/language_uk.h
Unescape Escape View File

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

2
Marlin/src/sd/cardreader.cpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save