diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h index 095a3440aa..c5230db098 100644 --- a/Marlin/src/lcd/language/language_an.h +++ b/Marlin/src/lcd/language/language_an.h @@ -42,7 +42,6 @@ namespace LanguageNarrow_an { LSTR MSG_MEDIA_REMOVED = _UxGT("Tarcheta sacada"); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("Menu prencipal"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Inicio automatico"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Amortar motors"); LSTR MSG_HOMING = _UxGT("Orichen"); LSTR MSG_AUTO_HOME = _UxGT("Levar a l'orichen"); @@ -155,13 +154,13 @@ namespace LanguageNarrow_an { LSTR MSG_AUTORETRACT = _UxGT("Retraccion auto."); LSTR MSG_FILAMENTCHANGE = _UxGT("Cambear filamento"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Cambear filamento *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Encetan. SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Encetan. USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Encetan. SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Encetan. media"); + LSTR MSG_ATTACH_SD = _UxGT("Encetan. SD"); + LSTR MSG_ATTACH_USB = _UxGT("Encetan. USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Cambiar tarcheta"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Inicio automatico"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch"); LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desfase X"); diff --git a/Marlin/src/lcd/language/language_bg.h b/Marlin/src/lcd/language/language_bg.h index 4eef867826..4f278c4bcf 100644 --- a/Marlin/src/lcd/language/language_bg.h +++ b/Marlin/src/lcd/language/language_bg.h @@ -40,7 +40,6 @@ namespace LanguageNarrow_bg { LSTR MSG_MEDIA_INSERTED = _UxGT("Картата е поставена"); LSTR MSG_MEDIA_REMOVED = _UxGT("Картата е извадена"); LSTR MSG_MAIN_MENU = _UxGT("Меню"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Автостарт"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Изкл. двигатели"); LSTR MSG_AUTO_HOME = _UxGT("Паркиране"); LSTR MSG_SET_HOME_OFFSETS = _UxGT("Задай Начало"); @@ -139,13 +138,13 @@ namespace LanguageNarrow_bg { LSTR MSG_AUTORETRACT = _UxGT("Автоoткат"); LSTR MSG_FILAMENTCHANGE = _UxGT("Смяна нишка"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Смяна нишка *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Иниц. SD-Карта"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Иниц. USB-Карта"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Иниц. SD-Карта"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Иниц. SD-Карта"); + LSTR MSG_ATTACH_SD = _UxGT("Иниц. SD-Карта"); + LSTR MSG_ATTACH_USB = _UxGT("Иниц. USB-Карта"); LSTR MSG_CHANGE_MEDIA = _UxGT("Смяна SD-Карта"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Автостарт"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z-сондата е извадена"); LSTR MSG_ZPROBE_XOFFSET = _UxGT("X Отстояние"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Y Отстояние"); diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h index fa74f255aa..be12c69df4 100644 --- a/Marlin/src/lcd/language/language_ca.h +++ b/Marlin/src/lcd/language/language_ca.h @@ -38,7 +38,6 @@ namespace LanguageNarrow_ca { LSTR MSG_MEDIA_REMOVED = _UxGT("Targeta extreta."); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); LSTR MSG_MAIN_MENU = _UxGT("Menú principal"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Inici automatic"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Desactiva motors"); LSTR MSG_DEBUG_MENU = _UxGT("Menu de depuracio"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barra progres"); @@ -145,13 +144,13 @@ namespace LanguageNarrow_ca { LSTR MSG_AUTORETRACT = _UxGT("Auto retraccio"); LSTR MSG_FILAMENTCHANGE = _UxGT("Canvia filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Canvia filament *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Inicialitza SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Inicialitza USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Inicialitza SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Inicialitza SD"); + LSTR MSG_ATTACH_SD = _UxGT("Inicialitza SD"); + LSTR MSG_ATTACH_USB = _UxGT("Inicialitza USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Canvia SD"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Inici automatic"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fora"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reinicia BLTouch"); LSTR MSG_HOME_FIRST = _UxGT("Home %s primer"); diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h index 9a01466227..ac23bc8daf 100644 --- a/Marlin/src/lcd/language/language_cz.h +++ b/Marlin/src/lcd/language/language_cz.h @@ -57,7 +57,6 @@ namespace LanguageNarrow_cz { LSTR MSG_MAIN_MENU = _UxGT("Hlavní nabídka"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Další nastavení"); LSTR MSG_CONFIGURATION = _UxGT("Konfigurace"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Uvolnit motory"); LSTR MSG_DEBUG_MENU = _UxGT("Nabídka ladění"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test uk. průběhu"); @@ -359,14 +358,13 @@ namespace LanguageNarrow_cz { LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Vysunout filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunout vše"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Načíst SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Načíst USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Načíst SD"); - #endif + LSTR MSG_ATTACH_MEDIA = _UxGT("Načíst médium"); + LSTR MSG_ATTACH_SD = _UxGT("Načíst SD"); + LSTR MSG_ATTACH_USB = _UxGT("Načíst USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Vyměnit médium"); LSTR MSG_RELEASE_MEDIA = _UxGT("Vysunout médium"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl"); LSTR MSG_SKEW_FACTOR = _UxGT("Faktor zkosení"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h index 35083aa01f..0a286d1751 100644 --- a/Marlin/src/lcd/language/language_da.h +++ b/Marlin/src/lcd/language/language_da.h @@ -133,7 +133,9 @@ namespace LanguageNarrow_da { LSTR MSG_AUTORETRACT = _UxGT("Auto-Retract"); LSTR MSG_FILAMENTCHANGE = _UxGT("Skift filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Skift filament *"); + LSTR MSG_CHANGE_MEDIA = _UxGT("Skift SD kort"); + LSTR MSG_ZPROBE_OUT = _UxGT("Probe udenfor plade"); LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Selv-Test"); LSTR MSG_HOME_FIRST = _UxGT("Home %s først"); diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index 23730d321a..e681317fb8 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -55,7 +55,6 @@ namespace LanguageNarrow_de { LSTR MSG_MAIN_MENU = _UxGT("Hauptmenü"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Erw. Einstellungen"); LSTR MSG_CONFIGURATION = _UxGT("Konfiguration"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Motoren deaktivieren"); // M84 :: Max length 19 characters LSTR MSG_DEBUG_MENU = _UxGT("Debug-Menü"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Statusbalken-Test"); @@ -493,14 +492,14 @@ namespace LanguageNarrow_de { LSTR MSG_FILAMENTUNLOAD = _UxGT("Filament entladen"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Filament entladen *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Alles entladen"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("SD initial."); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("USB initial."); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("SD initial."); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("SD initial."); + LSTR MSG_ATTACH_SD = _UxGT("SD initial."); + LSTR MSG_ATTACH_USB = _UxGT("USB initial."); LSTR MSG_CHANGE_MEDIA = _UxGT("Medium getauscht"); // SD-card changed by user. For machines with no autocarddetect. Both send "M21" LSTR MSG_RELEASE_MEDIA = _UxGT("Medium freigeben"); // if Marlin gets confused - M22 + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z-Sonde außerhalb"); LSTR MSG_SKEW_FACTOR = _UxGT("Korrekturfaktor"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h index 85de0f0751..0d3d355cb0 100644 --- a/Marlin/src/lcd/language/language_el.h +++ b/Marlin/src/lcd/language/language_el.h @@ -52,7 +52,6 @@ namespace LanguageNarrow_el { LSTR MSG_MEDIA_USB_FAILED = _UxGT("Αποτυχία εκκίνησης USB"); LSTR MSG_MEDIA_INIT_FAIL = _UxGT("Αποτυχία αρχικοποίησης SD"); LSTR MSG_MAIN_MENU = _UxGT("Αρχική Οθόνη"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Αυτόματη εκκίνηση"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Απενεργοποίηση μοτέρ"); LSTR MSG_AUTO_HOME = _UxGT("Αυτόμ. επαναφορά XYZ"); LSTR MSG_AUTO_HOME_X = _UxGT("Επαναφορά X"); @@ -180,13 +179,13 @@ namespace LanguageNarrow_el { LSTR MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση"); LSTR MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Προετοιμασία SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Προετοιμασία USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία SD"); + LSTR MSG_ATTACH_SD = _UxGT("Προετοιμασία SD"); + LSTR MSG_ATTACH_USB = _UxGT("Προετοιμασία USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Αυτόματη εκκίνηση"); + LSTR MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός Επ.Εκτύπωσης"); // SHORTEN LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πρώτα"); LSTR MSG_XYZ_UNHOMED = _UxGT("Επαναφορά ΧΥZ πρώτα"); diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h index 65b2da5ee3..3e2cb0ec07 100644 --- a/Marlin/src/lcd/language/language_el_gr.h +++ b/Marlin/src/lcd/language/language_el_gr.h @@ -41,7 +41,6 @@ namespace LanguageNarrow_el_gr { LSTR MSG_MEDIA_REMOVED = _UxGT("Αφαίρεση κάρτας"); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("Βασική Οθόνη"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Αυτόματη εκκίνηση"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Απενεργοποίηση βηματιστή"); LSTR MSG_AUTO_HOME = _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο"); LSTR MSG_AUTO_HOME_X = _UxGT("Αρχικό σημείο X"); @@ -170,13 +169,13 @@ namespace LanguageNarrow_el_gr { LSTR MSG_AUTORETRACT = _UxGT("Αυτόματη ανάσυρση"); LSTR MSG_FILAMENTCHANGE = _UxGT("Αλλαγή νήματος"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Αλλαγή νήματος *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Προετοιμασία SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Προετοιμασία USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Προετοιμασία SD"); + LSTR MSG_ATTACH_SD = _UxGT("Προετοιμασία SD"); + LSTR MSG_ATTACH_USB = _UxGT("Προετοιμασία USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Αλλαγή κάρτας SD"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Αυτόματη εκκίνηση"); + LSTR MSG_ZPROBE_OUT = _UxGT("Διερεύνηση Z εκτός κλίνης"); LSTR MSG_YX_UNHOMED = _UxGT("Επαναφορά Χ/Υ πριν από Z"); LSTR MSG_XYZ_UNHOMED = _UxGT("Επαναφορά ΧΥZ πρώτα"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index e0c1f53f77..d23e638a78 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -42,7 +42,13 @@ #endif #undef en -#define MEDIA_TYPE_EN "Media" +#if HAS_SDCARD && !HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_EN "SD Card" +#elif HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_EN "USB Drive" +#else + #define MEDIA_TYPE_EN "Media" +#endif #ifndef PREHEAT_1_LABEL #define PREHEAT_1_LABEL "" @@ -76,23 +82,32 @@ namespace LanguageNarrow_en { LSTR MSG_LOW = _UxGT("LOW"); LSTR MSG_BACK = _UxGT("Back"); LSTR MSG_ERROR = _UxGT("Error"); + LSTR MSG_MEDIA_ABORTING = _UxGT("Aborting..."); LSTR MSG_MEDIA_INSERTED = MEDIA_TYPE_EN _UxGT(" Inserted"); + LSTR MSG_MEDIA_INSERTED_SD = _UxGT("SD Card Inserted"); + LSTR MSG_MEDIA_INSERTED_USB = _UxGT("USB Drive Inserted"); LSTR MSG_MEDIA_REMOVED = MEDIA_TYPE_EN _UxGT(" Removed"); + LSTR MSG_MEDIA_REMOVED_SD = _UxGT("SD Card Removed"); + LSTR MSG_MEDIA_REMOVED_USB = _UxGT("USB Drive Removed"); LSTR MSG_MEDIA_WAITING = _UxGT("Waiting for ") MEDIA_TYPE_EN; + LSTR MSG_MEDIA_WAITING_SD = _UxGT("Waiting for SD Card"); + LSTR MSG_MEDIA_WAITING_USB = _UxGT("Waiting for USB Drive"); LSTR MSG_MEDIA_INIT_FAIL = MEDIA_TYPE_EN _UxGT(" Init Fail"); + LSTR MSG_MEDIA_INIT_FAIL_SD = _UxGT("SD Card Init Fail"); + LSTR MSG_MEDIA_INIT_FAIL_USB = _UxGT("USB Drive 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"); LSTR MSG_MEDIA_SORT = _UxGT("Sort ") MEDIA_TYPE_EN; LSTR MSG_MEDIA_UPDATE = MEDIA_TYPE_EN _UxGT(" Update"); + LSTR MSG_KILL_SUBCALL_OVERFLOW = _UxGT("Subcall Overflow"); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); // Max length 8 characters LSTR MSG_LCD_SOFT_ENDSTOPS = _UxGT("Soft Endstops"); LSTR MSG_MAIN_MENU = _UxGT("Main Menu"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Advanced Settings"); LSTR MSG_CONFIGURATION = _UxGT("Configuration"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Run Auto Files"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Disable Steppers"); LSTR MSG_DEBUG_MENU = _UxGT("Debug Menu"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Progress Bar Test"); @@ -613,14 +628,20 @@ namespace LanguageNarrow_en { LSTR MSG_FILAMENTUNLOAD = _UxGT("Unload Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Unload * Filament"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Unload All"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Attach SD Card"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Attach USB Drive"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Attach ") MEDIA_TYPE_EN; - #endif - LSTR MSG_CHANGE_MEDIA = _UxGT("Change ") MEDIA_TYPE_EN; + + LSTR MSG_ATTACH_MEDIA = _UxGT("Attach ") MEDIA_TYPE_EN; + LSTR MSG_ATTACH_SD = _UxGT("Attach SD Card"); + LSTR MSG_ATTACH_USB = _UxGT("Attach USB Drive"); LSTR MSG_RELEASE_MEDIA = _UxGT("Release ") MEDIA_TYPE_EN; + LSTR MSG_RELEASE_SD = _UxGT("Release SD Card"); + LSTR MSG_RELEASE_USB = _UxGT("Release USB Drive"); + LSTR MSG_CHANGE_MEDIA = _UxGT("Refresh ") MEDIA_TYPE_EN; + LSTR MSG_CHANGE_SD = _UxGT("Select SD Card"); + LSTR MSG_CHANGE_USB = _UxGT("Select USB Drive"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Run Autofiles"); + LSTR MSG_RUN_AUTOFILES_SD = _UxGT("Run SD Autofiles"); + LSTR MSG_RUN_AUTOFILES_USB = _UxGT("Run USB Autofiles"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed"); LSTR MSG_SKEW_FACTOR = _UxGT("Skew Factor"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); @@ -665,6 +686,7 @@ namespace LanguageNarrow_en { LSTR MSG_BABYSTEP_N = _UxGT("Babystep @"); LSTR MSG_BABYSTEP_TOTAL = _UxGT("Total"); LSTR MSG_ENDSTOP_ABORT = _UxGT("Endstop Abort"); + LSTR MSG_ERR_HEATING_FAILED = _UxGT("Heating Failed"); LSTR MSG_ERR_REDUNDANT_TEMP = _UxGT("Err: REDUNDANT TEMP"); LSTR MSG_ERR_THERMAL_RUNAWAY = _UxGT("THERMAL RUNAWAY"); @@ -686,6 +708,7 @@ namespace LanguageNarrow_en { LSTR MSG_CHAMBER_HEATING = _UxGT("Chamber Heating..."); LSTR MSG_CHAMBER_COOLING = _UxGT("Chamber Cooling..."); LSTR MSG_LASER_COOLING = _UxGT("Laser Cooling..."); + LSTR MSG_DELTA_CALIBRATE = _UxGT("Delta Calibration"); LSTR MSG_DELTA_CALIBRATION_IN_PROGRESS = _UxGT("Delta Calibration in progress"); LSTR MSG_DELTA_CALIBRATE_X = _UxGT("Calibrate X"); @@ -697,14 +720,9 @@ namespace LanguageNarrow_en { LSTR MSG_DELTA_DIAG_ROD = _UxGT("Diag Rod"); LSTR MSG_DELTA_HEIGHT = _UxGT("Height"); LSTR MSG_DELTA_RADIUS = _UxGT("Radius"); + LSTR MSG_INFO_MENU = _UxGT("About Printer"); LSTR MSG_INFO_PRINTER_MENU = _UxGT("Printer Info"); - LSTR MSG_3POINT_LEVELING = _UxGT("3-Point Leveling"); - LSTR MSG_LINEAR_LEVELING = _UxGT("Linear Leveling"); - LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilinear Leveling"); - LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); - LSTR MSG_MESH_LEVELING = _UxGT("Mesh Leveling"); - LSTR MSG_MESH_DONE = _UxGT("Mesh probing done"); LSTR MSG_INFO_PRINTER_STATS_MENU = _UxGT("Printer Stats"); LSTR MSG_INFO_STATS_MENU = _UxGT("Stats"); LSTR MSG_RESET_STATS = _UxGT("Reset Print Stats?"); @@ -715,6 +733,22 @@ namespace LanguageNarrow_en { LSTR MSG_INFO_PROTOCOL = _UxGT("Protocol"); LSTR MSG_INFO_RUNAWAY_OFF = _UxGT("Runaway Watch: OFF"); LSTR MSG_INFO_RUNAWAY_ON = _UxGT("Runaway Watch: ON"); + LSTR MSG_INFO_PRINT_COUNT = _UxGT("Prints"); + LSTR MSG_INFO_PRINT_TIME = _UxGT("Total"); + LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest"); + LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extruded"); + LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completed"); + LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp"); + LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp"); + LSTR MSG_INFO_PSU = _UxGT("PSU"); + + LSTR MSG_3POINT_LEVELING = _UxGT("3-Point Leveling"); + LSTR MSG_LINEAR_LEVELING = _UxGT("Linear Leveling"); + LSTR MSG_BILINEAR_LEVELING = _UxGT("Bilinear Leveling"); + LSTR MSG_UBL_LEVELING = _UxGT("Unified Bed Leveling"); + LSTR MSG_MESH_LEVELING = _UxGT("Mesh Leveling"); + LSTR MSG_MESH_DONE = _UxGT("Mesh probing done"); + LSTR MSG_HOTEND_IDLE_TIMEOUT = _UxGT("Hotend Idle Timeout"); LSTR MSG_BED_IDLE_TIMEOUT = _UxGT("Bed Idle Timeout"); LSTR MSG_HOTEND_IDLE_DISABLE = _UxGT("Disable Timeout"); @@ -726,15 +760,6 @@ namespace LanguageNarrow_en { LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Light Brightness"); LSTR MSG_KILL_EXPECTED_PRINTER = _UxGT("INCORRECT PRINTER"); - LSTR MSG_INFO_PRINT_COUNT = _UxGT("Prints"); - LSTR MSG_INFO_PRINT_TIME = _UxGT("Total"); - LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Longest"); - LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Extruded"); - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Completed"); - LSTR MSG_INFO_MIN_TEMP = _UxGT("Min Temp"); - LSTR MSG_INFO_MAX_TEMP = _UxGT("Max Temp"); - LSTR MSG_INFO_PSU = _UxGT("PSU"); - LSTR MSG_DRIVE_STRENGTH = _UxGT("Drive Strength"); LSTR MSG_DAC_PERCENT_N = _UxGT("@ Driver %"); LSTR MSG_ERROR_TMC = _UxGT("TMC CONNECTION ERROR"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 058b550f67..d1e4babf2b 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -28,7 +28,13 @@ * See also https://marlinfw.org/docs/development/lcd_language.html */ -#define MEDIA_TYPE_ES "SD/FD" +#if HAS_SDCARD && !HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_ES "SD" +#elif HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_ES "USB" +#else + #define MEDIA_TYPE_ES "SD/FD" +#endif namespace LanguageNarrow_es { using namespace Language_en; // Inherit undefined strings from English @@ -54,7 +60,6 @@ namespace LanguageNarrow_es { LSTR MSG_MAIN_MENU = _UxGT("Menú principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Ajustes avanzados"); LSTR MSG_CONFIGURATION = _UxGT("Configuración"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Inicio automático"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Apagar motores"); LSTR MSG_DEBUG_MENU = _UxGT("Menú depuración"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Prob. barra progreso"); @@ -368,14 +373,14 @@ namespace LanguageNarrow_es { LSTR MSG_FILAMENTUNLOAD = _UxGT("Descargar filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Descargar fil. *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Descargar todo"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Iniciar SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Iniciar USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar ") MEDIA_TYPE_ES; - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar ") MEDIA_TYPE_ES; + LSTR MSG_ATTACH_SD = _UxGT("Iniciar SD"); + LSTR MSG_ATTACH_USB = _UxGT("Iniciar USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Cambiar ") MEDIA_TYPE_ES; LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar ") MEDIA_TYPE_ES; + LSTR MSG_RUN_AUTOFILES = _UxGT("Inicio automático"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z fuera cama"); LSTR MSG_SKEW_FACTOR = _UxGT("Factor de desviación"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index 561de0b8e6..52612a8081 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -42,7 +42,6 @@ namespace LanguageNarrow_eu { LSTR MSG_MEDIA_INSERTED = _UxGT("Txartela sartuta"); LSTR MSG_MEDIA_REMOVED = _UxGT("Txartela kenduta"); LSTR MSG_MAIN_MENU = _UxGT("Menu nagusia"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Auto hasiera"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Itzali motoreak"); LSTR MSG_DEBUG_MENU = _UxGT("Arazketa Menua"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Prog. Barra Proba"); @@ -219,13 +218,13 @@ namespace LanguageNarrow_eu { LSTR MSG_FILAMENTUNLOAD = _UxGT("Harizpia deskargatu"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Harizpia deskargatu *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Erabat deskargatu"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Hasieratu SD-a"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Hasieratu USB-a"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Hasieratu SD-a"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Hasieratu SD-a"); + LSTR MSG_ATTACH_SD = _UxGT("Hasieratu SD-a"); + LSTR MSG_ATTACH_USB = _UxGT("Hasieratu USB-a"); LSTR MSG_CHANGE_MEDIA = _UxGT("Aldatu txartela"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Auto hasiera"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z zunda kanpora"); LSTR MSG_SKEW_FACTOR = _UxGT("Okertze faktorea"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_fi.h b/Marlin/src/lcd/language/language_fi.h index 7b3f0f6082..d70c67208c 100644 --- a/Marlin/src/lcd/language/language_fi.h +++ b/Marlin/src/lcd/language/language_fi.h @@ -40,7 +40,7 @@ namespace LanguageNarrow_fi { LSTR MSG_MEDIA_INSERTED = _UxGT("Kortti asetettu"); LSTR MSG_MEDIA_REMOVED = _UxGT("Kortti poistettu"); LSTR MSG_MAIN_MENU = _UxGT("Palaa"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Automaatti"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Automaatti"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Vapauta moottorit"); LSTR MSG_AUTO_HOME = _UxGT("Aja referenssiin"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index 13bee9fbb8..6d9fd3b4f4 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -52,7 +52,6 @@ namespace LanguageNarrow_fr { LSTR MSG_MAIN_MENU = _UxGT("Menu principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Config. avancée"); LSTR MSG_CONFIGURATION = _UxGT("Configuration"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Exéc. auto.gcode"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Arrêter moteurs"); LSTR MSG_DEBUG_MENU = _UxGT("Menu debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barre progress."); @@ -392,14 +391,14 @@ namespace LanguageNarrow_fr { LSTR MSG_FILAMENTUNLOAD = _UxGT("Retrait filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Retrait filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Retirer tout"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Charger le SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Charger le USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le SD"); + LSTR MSG_ATTACH_SD = _UxGT("Charger le SD"); + LSTR MSG_ATTACH_USB = _UxGT("Charger le USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Actualiser média"); LSTR MSG_RELEASE_MEDIA = _UxGT("Retirer le média"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Exéc. auto.gcode"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonde Z hors lit"); LSTR MSG_SKEW_FACTOR = _UxGT("Facteur écart"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index a3da3082de..07f2b86499 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -52,7 +52,6 @@ namespace LanguageNarrow_fr_na { LSTR MSG_MAIN_MENU = _UxGT("Menu principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Config. avancee"); LSTR MSG_CONFIGURATION = _UxGT("Configuration"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Exec. auto.gcode"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Arreter moteurs"); LSTR MSG_DEBUG_MENU = _UxGT("Menu debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barre progress."); @@ -392,14 +391,14 @@ namespace LanguageNarrow_fr_na { LSTR MSG_FILAMENTUNLOAD = _UxGT("Retrait filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Retrait filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Retirer tout"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Charger le SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Charger le USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Charger le SD"); + LSTR MSG_ATTACH_SD = _UxGT("Charger le SD"); + LSTR MSG_ATTACH_USB = _UxGT("Charger le USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Actualiser media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Retirer le media"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Exec. auto.gcode"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonde Z hors lit"); LSTR MSG_SKEW_FACTOR = _UxGT("Facteur ecart"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h index 3287ae2676..6dd699f1bd 100644 --- a/Marlin/src/lcd/language/language_gl.h +++ b/Marlin/src/lcd/language/language_gl.h @@ -30,7 +30,13 @@ #define DISPLAY_CHARSET_ISO10646_1 -#define MEDIA_TYPE_GL "SD/FD" +#if HAS_SDCARD && !HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_GL "SD" +#elif HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_GL "FD" +#else + #define MEDIA_TYPE_GL "SD/FD" +#endif namespace LanguageNarrow_gl { using namespace Language_en; // Inherit undefined strings from English @@ -55,7 +61,6 @@ namespace LanguageNarrow_gl { LSTR MSG_MAIN_MENU = _UxGT("Menú principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Axustes avanzados"); LSTR MSG_CONFIGURATION = _UxGT("Configuración"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autoarranque"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Apagar motores"); LSTR MSG_DEBUG_MENU = _UxGT("Menú depuración"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barra progreso"); @@ -383,14 +388,14 @@ namespace LanguageNarrow_gl { LSTR MSG_FILAMENTUNLOAD = _UxGT("Descargar Filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Descargar Filamento *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Descargar Todo"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Iniciar SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Iniciar USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar ") MEDIA_TYPE_GL; - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar ") MEDIA_TYPE_GL; + LSTR MSG_ATTACH_SD = _UxGT("Iniciar SD"); + LSTR MSG_ATTACH_USB = _UxGT("Iniciar USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Cambiar ") MEDIA_TYPE_GL; LSTR MSG_RELEASE_MEDIA = _UxGT("Lanzar ") MEDIA_TYPE_GL; + LSTR MSG_RUN_AUTOFILES = _UxGT("Autoarranque"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda-Z fóra Cama"); LSTR MSG_SKEW_FACTOR = _UxGT("Factor de Desviación"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h index 5f60b000e3..a75dcff846 100644 --- a/Marlin/src/lcd/language/language_hr.h +++ b/Marlin/src/lcd/language/language_hr.h @@ -41,7 +41,6 @@ namespace LanguageNarrow_hr { LSTR MSG_MEDIA_REMOVED = _UxGT("SD kartica uklonjena"); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("Main"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Auto pokretanje"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Ugasi steppere"); LSTR MSG_AUTO_HOME = _UxGT("Automatski homing"); LSTR MSG_AUTO_HOME_X = _UxGT("Home-aj X"); @@ -117,13 +116,13 @@ namespace LanguageNarrow_hr { LSTR MSG_STOPPED = _UxGT("ZAUSTAVLJEN. "); LSTR MSG_FILAMENTCHANGE = _UxGT("Promijeni filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Promijeni filament *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Init. SD karticu"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Init. USB pogon"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD karticu"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD karticu"); + LSTR MSG_ATTACH_SD = _UxGT("Init. SD karticu"); + LSTR MSG_ATTACH_USB = _UxGT("Init. USB pogon"); LSTR MSG_CHANGE_MEDIA = _UxGT("Promijeni SD karticu"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Auto pokretanje"); + LSTR MSG_ERR_HEATING_FAILED = _UxGT("Grijanje neuspješno"); LSTR MSG_HEATING = _UxGT("Grijanje..."); LSTR MSG_BED_HEATING = _UxGT("Grijanje Bed-a..."); diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h index a626aa2209..3159b79827 100644 --- a/Marlin/src/lcd/language/language_hu.h +++ b/Marlin/src/lcd/language/language_hu.h @@ -57,7 +57,6 @@ namespace LanguageNarrow_hu { LSTR MSG_MAIN_MENU = _UxGT(""); LSTR MSG_ADVANCED_SETTINGS = _UxGT("További beállítások"); LSTR MSG_CONFIGURATION = _UxGT("Konfiguráció"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Fájl auto. futtatás"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Motorok kikapcsolása"); LSTR MSG_DEBUG_MENU = _UxGT("Hiba Menü"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Haladás sáv teszt"); @@ -431,14 +430,14 @@ namespace LanguageNarrow_hu { LSTR MSG_FILAMENTUNLOAD = _UxGT("Szál eltávolítás"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Szál eltávolítás *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Mindet eltávolít"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Tároló SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Tároló USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Tároló SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Tároló SD"); + LSTR MSG_ATTACH_SD = _UxGT("Tároló SD"); + LSTR MSG_ATTACH_USB = _UxGT("Tároló USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Tároló csere"); LSTR MSG_RELEASE_MEDIA = _UxGT("Tároló Kiadása"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Fájl auto. futtatás"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z szonda tálcán kivül"); LSTR MSG_SKEW_FACTOR = _UxGT("Ferdeség faktor"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index c1b5366332..424bcd8367 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -38,7 +38,13 @@ #define DISPLAY_CHARSET_ISO10646_1 -#define MEDIA_TYPE_IT "Media" +#if HAS_SDCARD && !HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_IT "SD" +#elif HAS_USB_FLASH_DRIVE + #define MEDIA_TYPE_IT "USB" +#else + #define MEDIA_TYPE_IT "Media" +#endif namespace LanguageNarrow_it { using namespace Language_en; // Inherit undefined strings from English @@ -69,7 +75,6 @@ namespace LanguageNarrow_it { LSTR MSG_MAIN_MENU = _UxGT("Menu principale"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Impostaz. avanzate"); LSTR MSG_CONFIGURATION = _UxGT("Configurazione"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Esegui files auto"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Disabilita motori"); LSTR MSG_DEBUG_MENU = _UxGT("Menu di debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test barra avanzam."); @@ -581,14 +586,14 @@ namespace LanguageNarrow_it { LSTR MSG_FILAMENTUNLOAD = _UxGT("Rimuovi filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Rimuovi filam. *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Rimuovi tutto"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Collega scheda SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Collega penna USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Collega ") MEDIA_TYPE_IT; - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Collega ") MEDIA_TYPE_IT; + LSTR MSG_ATTACH_SD = _UxGT("Collega scheda SD"); + LSTR MSG_ATTACH_USB = _UxGT("Collega penna USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Cambia ") MEDIA_TYPE_IT; LSTR MSG_RELEASE_MEDIA = _UxGT("Rilascia ") MEDIA_TYPE_IT; + LSTR MSG_RUN_AUTOFILES = _UxGT("Esegui files auto"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z probe fuori piatto"); LSTR MSG_SKEW_FACTOR = _UxGT("Fattore distorsione"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_jp_kana.h b/Marlin/src/lcd/language/language_jp_kana.h index ae88b1d968..37c9aa043e 100644 --- a/Marlin/src/lcd/language/language_jp_kana.h +++ b/Marlin/src/lcd/language/language_jp_kana.h @@ -47,7 +47,6 @@ namespace LanguageNarrow_jp_kana { LSTR MSG_RELEASE_MEDIA = _UxGT("メディアノトリダシ"); LSTR MSG_LCD_ENDSTOPS = _UxGT("エンドストップ"); // "Endstops" // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("メイン"); // "Main" - LSTR MSG_RUN_AUTO_FILES = _UxGT("ジドウカイシ"); // "Autostart" LSTR MSG_DISABLE_STEPPERS = _UxGT("モーターデンゲン オフ"); // "Disable steppers" LSTR MSG_DEBUG_MENU = _UxGT("デバッグメニュー"); // "Debug Menu" LSTR MSG_PROGRESS_BAR_TEST = _UxGT("プログレスバー テスト"); // "Progress Bar Test" @@ -168,13 +167,13 @@ namespace LanguageNarrow_jp_kana { LSTR MSG_CONTROL_RETRACT_RECOVERF = _UxGT("ホショウソクド mm/s"); // "Unretract V" LSTR MSG_AUTORETRACT = _UxGT("ジドウヒキコミ"); // "Auto-Retract" LSTR MSG_FILAMENTCHANGE = _UxGT("フィラメントコウカン"); // "Change filament" - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("SDカードをマウントする"); // "Attach SD Card" - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("USBメモリをマウントする"); // "Attach USB Drive" - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("SDカードをマウントする"); // "Attach SD Card" - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("SDカードをマウントする"); // "Attach SD Card" + LSTR MSG_ATTACH_SD = _UxGT("SDカードをマウントする"); // "Attach SD Card" + LSTR MSG_ATTACH_USB = _UxGT("USBメモリをマウントする"); // "Attach USB Drive" LSTR MSG_CHANGE_MEDIA = _UxGT("メディアコウカン"); // "Change SD card" + LSTR MSG_RUN_AUTOFILES = _UxGT("ジドウカイシ"); // "Autostart" + LSTR MSG_ZPROBE_OUT = _UxGT("Zプローブ ベッドガイ"); // "Z probe out. bed" LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch ジコシンダン"); // "BLTouch Self-Test" LSTR MSG_BLTOUCH_RESET = _UxGT("BLTouch リセット"); // "Reset BLTouch" diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h index d5410cadf5..4ecaab5394 100644 --- a/Marlin/src/lcd/language/language_ko_KR.h +++ b/Marlin/src/lcd/language/language_ko_KR.h @@ -42,7 +42,7 @@ namespace LanguageNarrow_ko_KR { LSTR MSG_MAIN_MENU = _UxGT("뒤로"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("고급 설정"); LSTR MSG_CONFIGURATION = _UxGT("설정"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("자동 시작"); + LSTR MSG_RUN_AUTOFILES = _UxGT("자동 시작"); LSTR MSG_DISABLE_STEPPERS = _UxGT("모터 정지"); LSTR MSG_DEBUG_MENU = _UxGT("디버깅 메뉴"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("프로그레스바 테스트"); diff --git a/Marlin/src/lcd/language/language_nl.h b/Marlin/src/lcd/language/language_nl.h index e99417a2dc..bb4c7e00b2 100644 --- a/Marlin/src/lcd/language/language_nl.h +++ b/Marlin/src/lcd/language/language_nl.h @@ -43,7 +43,6 @@ namespace LanguageNarrow_nl { LSTR MSG_MEDIA_REMOVED = _UxGT("Kaart verwijderd"); LSTR MSG_LCD_ENDSTOPS = _UxGT("Endstops"); // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("Hoofdmenu"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Motoren uit"); LSTR MSG_DEBUG_MENU = _UxGT("Debug Menu"); // accepted English terms LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Vooruitgang Test"); @@ -146,13 +145,13 @@ namespace LanguageNarrow_nl { LSTR MSG_AUTORETRACT = _UxGT("Auto-Retract"); LSTR MSG_FILAMENTCHANGE = _UxGT("Verv. Filament"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Verv. Filament *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Init. SD kaart"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Init. USB stick"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD kaart"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Init. SD kaart"); + LSTR MSG_ATTACH_SD = _UxGT("Init. SD kaart"); + LSTR MSG_ATTACH_USB = _UxGT("Init. USB stick"); LSTR MSG_CHANGE_MEDIA = _UxGT("Verv. SD Kaart"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z probe uit. bed"); LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Zelf-Test"); LSTR MSG_BLTOUCH_RESET = _UxGT("Reset BLTouch"); diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h index 07573bb2d8..7c7297d184 100644 --- a/Marlin/src/lcd/language/language_pl.h +++ b/Marlin/src/lcd/language/language_pl.h @@ -61,7 +61,6 @@ namespace LanguageNarrow_pl { LSTR MSG_MAIN_MENU = _UxGT("Menu główne"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Ustawienie zaawansowane"); LSTR MSG_CONFIGURATION = _UxGT("Konfiguracja"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Wyłącz silniki"); LSTR MSG_DEBUG_MENU = _UxGT("Menu Debugowania"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Testowy pasek postępu"); @@ -358,14 +357,14 @@ namespace LanguageNarrow_pl { LSTR MSG_FILAMENTUNLOAD = _UxGT("Wysuń Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Wysuń Filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Wysuń wszystkie"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Inicjal. karty SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Inicjal. dysk flash"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Inicjal. karty SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Inicjal. karty SD"); + LSTR MSG_ATTACH_SD = _UxGT("Inicjal. karty SD"); + LSTR MSG_ATTACH_USB = _UxGT("Inicjal. dysk flash"); LSTR MSG_CHANGE_MEDIA = _UxGT("Zmiana karty SD"); LSTR MSG_RELEASE_MEDIA = _UxGT("Zwolnienie karty"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z za stołem"); LSTR MSG_SKEW_FACTOR = _UxGT("Współczynik skrzywienia"); LSTR MSG_BLTOUCH_SELFTEST = _UxGT("BLTouch Self-Test"); diff --git a/Marlin/src/lcd/language/language_pt.h b/Marlin/src/lcd/language/language_pt.h index 62799fc9a5..229211b4f2 100644 --- a/Marlin/src/lcd/language/language_pt.h +++ b/Marlin/src/lcd/language/language_pt.h @@ -142,13 +142,12 @@ namespace LanguageNarrow_pt { LSTR MSG_AUTORETRACT = _UxGT(" Auto-Retract"); LSTR MSG_FILAMENTCHANGE = _UxGT("Trocar filamento"); LSTR MSG_FILAMENTCHANGE_E = _UxGT("Trocar filamento *"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Inici. cartão SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Inici. flash USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Inici. cartão SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Inici. cartão SD"); + LSTR MSG_ATTACH_SD = _UxGT("Inici. cartão SD"); + LSTR MSG_ATTACH_USB = _UxGT("Inici. flash USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Trocar cartão SD"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sensor fora/base"); LSTR MSG_ZPROBE_XOFFSET = _UxGT("Desvio X"); LSTR MSG_ZPROBE_YOFFSET = _UxGT("Desvio Y"); diff --git a/Marlin/src/lcd/language/language_pt_br.h b/Marlin/src/lcd/language/language_pt_br.h index 8d5a608d00..80a8d95bdb 100644 --- a/Marlin/src/lcd/language/language_pt_br.h +++ b/Marlin/src/lcd/language/language_pt_br.h @@ -50,7 +50,6 @@ namespace LanguageNarrow_pt_br { LSTR MSG_MAIN_MENU = _UxGT("Menu principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Config. Avançada"); LSTR MSG_CONFIGURATION = _UxGT("Configuração"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Início automático"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Desabilit. motores"); LSTR MSG_DEBUG_MENU = _UxGT("Menu Debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Testar Barra Progres"); @@ -321,14 +320,14 @@ namespace LanguageNarrow_pt_br { LSTR MSG_FILAMENTUNLOAD = _UxGT("Descarreg. Filamento"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Descarreg. Filamento *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Descarregar Todos"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Iniciar cartão SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Iniciar flash USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar cartão SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Iniciar cartão SD"); + LSTR MSG_ATTACH_SD = _UxGT("Iniciar cartão SD"); + LSTR MSG_ATTACH_USB = _UxGT("Iniciar flash USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Trocar SD"); LSTR MSG_RELEASE_MEDIA = _UxGT("Liberar SD"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Início automático"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda fora da mesa"); LSTR MSG_SKEW_FACTOR = _UxGT("Fator de Cisalho"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 0b263a4ea6..7337862909 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -52,7 +52,6 @@ namespace LanguageNarrow_ro { LSTR MSG_MAIN_MENU = _UxGT("Principal"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Setari Avansate"); LSTR MSG_CONFIGURATION = _UxGT("Configurare"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Dezactivare Motoare"); LSTR MSG_DEBUG_MENU = _UxGT("Meniu Debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test Bara Progres"); @@ -388,14 +387,14 @@ namespace LanguageNarrow_ro { LSTR MSG_FILAMENTUNLOAD = _UxGT("Scoatere Filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Scoatere Filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Scoate Tot"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Atasare card SD"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Atasare FD USB"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Atasare card SD"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Atasare card SD"); + LSTR MSG_ATTACH_SD = _UxGT("Atasare card SD"); + LSTR MSG_ATTACH_USB = _UxGT("Atasare FD USB"); LSTR MSG_CHANGE_MEDIA = _UxGT("Inlocuire Media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Eliberare Media"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z Probe Past Bed"); LSTR MSG_SKEW_FACTOR = _UxGT("Skew Factor"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h index 42e1656a8b..40b3a03d3d 100644 --- a/Marlin/src/lcd/language/language_ru.h +++ b/Marlin/src/lcd/language/language_ru.h @@ -53,7 +53,6 @@ namespace LanguageNarrow_ru { LSTR MSG_LCD_ENDSTOPS = _UxGT("Концевик"); // Max length 8 characters LSTR MSG_MAIN_MENU = _UxGT("Главное меню"); LSTR MSG_CONFIGURATION = _UxGT("Конфигурация"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Автостарт"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Выключить двигатели"); LSTR MSG_DEBUG_MENU = _UxGT("Меню отладки"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Тест индикатора"); @@ -435,14 +434,14 @@ namespace LanguageNarrow_ru { LSTR MSG_FILAMENTLOAD_E = _UxGT("Подать филамент *"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Убрать филамент *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Выгрузить всё"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Установить SD карту"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Монтировать USB"); // Установить флешка - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Установить SD карту"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Установить SD карту"); + LSTR MSG_ATTACH_SD = _UxGT("Установить SD карту"); + LSTR MSG_ATTACH_USB = _UxGT("Монтировать USB"); // Установить флешка LSTR MSG_CHANGE_MEDIA = _UxGT("Сменить SD карту"); LSTR MSG_RELEASE_MEDIA = _UxGT("Освободить SD карту"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Автостарт"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z-зонд вне стола"); LSTR MSG_SKEW_FACTOR = _UxGT("Фактор перекоса"); LSTR MSG_BLTOUCH = _UxGT("Z-зонд BLTouch"); diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h index 782f42f118..7a8c228d84 100644 --- a/Marlin/src/lcd/language/language_sk.h +++ b/Marlin/src/lcd/language/language_sk.h @@ -68,7 +68,6 @@ namespace LanguageNarrow_sk { LSTR MSG_MAIN_MENU = _UxGT("Hlavná ponuka"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Pokročilé nastav."); LSTR MSG_CONFIGURATION = _UxGT("Konfigurácia"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Auto-štart"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Uvolniť motory"); LSTR MSG_DEBUG_MENU = _UxGT("Ponuka ladenia"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Test uk. priebehu"); @@ -533,14 +532,14 @@ namespace LanguageNarrow_sk { LSTR MSG_FILAMENTUNLOAD = _UxGT("Vysunúť filament"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Vysunúť filament *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Vysunúť všetko"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Načítať SD kartu"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Načítať USB disk"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Načítať SD kartu"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Načítať SD kartu"); + LSTR MSG_ATTACH_SD = _UxGT("Načítať SD kartu"); + LSTR MSG_ATTACH_USB = _UxGT("Načítať USB disk"); LSTR MSG_CHANGE_MEDIA = _UxGT("Vymeniť kartu"); LSTR MSG_RELEASE_MEDIA = _UxGT("Odpojiť kartu"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Auto-štart"); + LSTR MSG_ZPROBE_OUT = _UxGT("Sonda Z mimo podl."); LSTR MSG_SKEW_FACTOR = _UxGT("Faktor skosenia"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h index 356a253b6e..e2e408391c 100644 --- a/Marlin/src/lcd/language/language_sv.h +++ b/Marlin/src/lcd/language/language_sv.h @@ -54,7 +54,6 @@ namespace LanguageNarrow_sv { LSTR MSG_MAIN_MENU = _UxGT("Huvud"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Advancerade inställningar"); LSTR MSG_CONFIGURATION = _UxGT("Konfiguration"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Autostarta Filer"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Inaktivera Stegare"); LSTR MSG_DEBUG_MENU = _UxGT("Debug Meny"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Framstegsindikator Test"); @@ -417,14 +416,14 @@ namespace LanguageNarrow_sv { LSTR MSG_FILAMENTUNLOAD = _UxGT("Lossa Tråd"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Lossa *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Lossa All"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Bifoga SD-kort"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Bifoga USB-minne"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Bifoga SD-kort"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Bifoga SD-kort"); + LSTR MSG_ATTACH_SD = _UxGT("Bifoga SD-kort"); + LSTR MSG_ATTACH_USB = _UxGT("Bifoga USB-minne"); LSTR MSG_CHANGE_MEDIA = _UxGT("Byt Media"); LSTR MSG_RELEASE_MEDIA = _UxGT("Släpp Media"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Autostarta Filer"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z Sond Utanför Bädd"); LSTR MSG_SKEW_FACTOR = _UxGT("Skev Faktor"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h index 947f094fa6..36fe4188fa 100644 --- a/Marlin/src/lcd/language/language_tr.h +++ b/Marlin/src/lcd/language/language_tr.h @@ -68,7 +68,6 @@ namespace LanguageNarrow_tr { LSTR MSG_MAIN_MENU = _UxGT("Ana"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Gelişmiş Ayarlar"); LSTR MSG_CONFIGURATION = _UxGT("Yapılandırma"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Oto. Başlat"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Motorları Durdur"); LSTR MSG_DEBUG_MENU = _UxGT("Hata Ayıklama"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Durum Çubuğu Testi"); @@ -550,14 +549,14 @@ namespace LanguageNarrow_tr { LSTR MSG_FILAMENTUNLOAD = _UxGT("Filaman Çıkart"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Filaman Çıkart *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Tümünü Çıkart"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("SD Kartı takın"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("USB Sürücüyü takın"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Medyayı Ekle"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Medyayı Ekle"); + LSTR MSG_ATTACH_SD = _UxGT("SD Kartı takın"); + LSTR MSG_ATTACH_USB = _UxGT("USB Sürücüyü takın"); LSTR MSG_CHANGE_MEDIA = _UxGT("Medyayı Değiştir"); LSTR MSG_RELEASE_MEDIA = _UxGT("Medyayı Çıkart"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Oto. Başlat"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z Prob Tablayı Geçti"); LSTR MSG_SKEW_FACTOR = _UxGT("Çarpıklık Faktörü"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h index c061b9ad02..4d323d6ba7 100644 --- a/Marlin/src/lcd/language/language_uk.h +++ b/Marlin/src/lcd/language/language_uk.h @@ -54,7 +54,6 @@ namespace LanguageNarrow_uk { LSTR MSG_MAIN_MENU = _UxGT("Основне меню"); LSTR MSG_ADVANCED_SETTINGS = _UxGT("Інші налаштування"); LSTR MSG_CONFIGURATION = _UxGT("Конфігурація"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("Автостарт"); LSTR MSG_DISABLE_STEPPERS = _UxGT("Вимкнути двигуни"); LSTR MSG_DEBUG_MENU = _UxGT("Меню Debug"); LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Тест лінії прогр."); @@ -445,14 +444,14 @@ namespace LanguageNarrow_uk { LSTR MSG_FILAMENTUNLOAD = _UxGT("Видалити пруток"); LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Видалити пруток *"); LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Видалити все"); - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Вставити SD-картку"); - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Вставити USB флешка"); - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Вставити SD-картку"); - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Вставити SD-картку"); + LSTR MSG_ATTACH_SD = _UxGT("Вставити SD-картку"); + LSTR MSG_ATTACH_USB = _UxGT("Вставити USB флешка"); LSTR MSG_CHANGE_MEDIA = _UxGT("Заміна SD-картки"); LSTR MSG_RELEASE_MEDIA = _UxGT("Видаліть SD-картку"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Автостарт"); + LSTR MSG_ZPROBE_OUT = _UxGT("Z-Зонд поза столом"); LSTR MSG_SKEW_FACTOR = _UxGT("Фактор нахилу"); LSTR MSG_BLTOUCH = _UxGT("BLTouch"); diff --git a/Marlin/src/lcd/language/language_vi.h b/Marlin/src/lcd/language/language_vi.h index fb158e306b..f7f5545bcb 100644 --- a/Marlin/src/lcd/language/language_vi.h +++ b/Marlin/src/lcd/language/language_vi.h @@ -47,7 +47,6 @@ namespace LanguageNarrow_vi { LSTR MSG_MAIN_MENU = _UxGT("Chính"); // Main LSTR MSG_ADVANCED_SETTINGS = _UxGT("Thiết lập cấp cao"); // Advanced Settings LSTR MSG_CONFIGURATION = _UxGT("Cấu hình"); // Configuration - LSTR MSG_RUN_AUTO_FILES = _UxGT("Khởi chạy tự động"); // Autostart LSTR MSG_DISABLE_STEPPERS = _UxGT("Tắt động cơ bước"); // Disable steppers LSTR MSG_DEBUG_MENU = _UxGT("Menu gỡ lỗi"); // Debug Menu LSTR MSG_PROGRESS_BAR_TEST = _UxGT("Kiểm tra tiến độ"); // Progress bar test @@ -309,14 +308,14 @@ namespace LanguageNarrow_vi { LSTR MSG_FILAMENTUNLOAD = _UxGT("Dỡ dây nhựa"); // Unload filament LSTR MSG_FILAMENTUNLOAD_E = _UxGT("Dỡ dây nhựa *"); // Unload filament LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("Dỡ tất cả"); // Unload All - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("Khởi tạo thẻ SD"); // Attach SD Card - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("Khởi tạo thanh USB"); // Attach USB Drive - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("Khởi tạo phương tiện"); // Attach media - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("Khởi tạo phương tiện"); // Attach media + LSTR MSG_ATTACH_SD = _UxGT("Khởi tạo thẻ SD"); // Attach SD Card + LSTR MSG_ATTACH_USB = _UxGT("Khởi tạo thanh USB"); // Attach USB Drive LSTR MSG_CHANGE_MEDIA = _UxGT("Thay phương tiện"); // Change midea LSTR MSG_RELEASE_MEDIA = _UxGT("Phát hành phương tiện"); + LSTR MSG_RUN_AUTOFILES = _UxGT("Khởi chạy tự động"); // Autostart + LSTR MSG_ZPROBE_OUT = _UxGT("Đầu Dò Z qua bàn"); // Z Probe past bed LSTR MSG_SKEW_FACTOR = _UxGT("Hệ số nghiêng"); // Skew Factor LSTR MSG_BLTOUCH = _UxGT("BLTOUCH"); // BLTouch @@ -373,19 +372,11 @@ namespace LanguageNarrow_vi { LSTR MSG_INFO_PROTOCOL = _UxGT("Giao Thức"); // Protocol LSTR MSG_CASE_LIGHT = _UxGT("Đèn Khuông"); // Case light LSTR MSG_CASE_LIGHT_BRIGHTNESS = _UxGT("Độ Sáng"); // Light Brightness - #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2 - LSTR MSG_INFO_PRINT_COUNT = _UxGT("Số In"); // Print Count - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Đã hoàn thành"); - LSTR MSG_INFO_PRINT_TIME = _UxGT("Tổng số thời gian in"); // Total print time - LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Thời gian việc lâu nhất"); // Longest job time - LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Tổng số đùn"); // Extruded total - #else - LSTR MSG_INFO_PRINT_COUNT = _UxGT("In"); // Prints - LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Đã hoàn thành"); // Completed - LSTR MSG_INFO_PRINT_TIME = _UxGT("Tổng số"); // Total - LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Dài nhất"); // Longest - LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Đã ép đùn"); - #endif + LSTR MSG_INFO_PRINT_COUNT = _UxGT("In"); // Prints + LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Đã hoàn thành"); // Completed + LSTR MSG_INFO_PRINT_TIME = _UxGT("Tổng số"); // Total + LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Dài nhất"); // Longest + LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Đã ép đùn"); LSTR MSG_INFO_MIN_TEMP = _UxGT("Nhiệt độ tối thiểu"); // Min Temp LSTR MSG_INFO_MAX_TEMP = _UxGT("Nhiệt độ tối đa"); // Max temp LSTR MSG_INFO_PSU = _UxGT("Bộ nguồn"); // PSU @@ -446,6 +437,11 @@ namespace LanguageNarrow_vi { namespace LanguageWide_vi { using namespace LanguageNarrow_vi; #if LCD_WIDTH >= 20 || HAS_DWIN_E3V2 + LSTR MSG_INFO_PRINT_COUNT = _UxGT("Số In"); // Print Count + LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Đã hoàn thành"); + LSTR MSG_INFO_PRINT_TIME = _UxGT("Tổng số thời gian in"); // Total print time + LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Thời gian việc lâu nhất"); // Longest job time + LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Tổng số đùn"); // Extruded total #endif } diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 680ff8c9b0..01f9f53d0c 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -54,7 +54,6 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_MAIN_MENU = _UxGT("主菜单"); // "Main" LSTR MSG_ADVANCED_SETTINGS = _UxGT("高级设置"); LSTR MSG_CONFIGURATION = _UxGT("配置"); - LSTR MSG_RUN_AUTO_FILES = _UxGT("自动开始"); // "Autostart" LSTR MSG_DISABLE_STEPPERS = _UxGT("关闭步进电机"); // "Disable steppers" LSTR MSG_DEBUG_MENU = _UxGT("调试菜单"); // "Debug Menu" LSTR MSG_PROGRESS_BAR_TEST = _UxGT("进度条测试"); // "Progress Bar Test" @@ -398,14 +397,14 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_FILAMENTUNLOAD = _UxGT("卸载丝料"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_E = _UxGT("卸载丝料 *"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("卸载全部"); // "Unload All" - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("挂载存储卡"); // "Attach SD Card" - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("挂载U盘"); // "Attach USB Drive" - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("挂载存储卡"); // "Attach SD Card" - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("挂载存储卡"); // "Attach SD Card" + LSTR MSG_ATTACH_SD = _UxGT("挂载存储卡"); // "Attach SD Card" + LSTR MSG_ATTACH_USB = _UxGT("挂载U盘"); // "Attach USB Drive" LSTR MSG_CHANGE_MEDIA = _UxGT("更换存储卡"); // "Change SD card" LSTR MSG_RELEASE_MEDIA = _UxGT("释放存储卡"); + LSTR MSG_RUN_AUTOFILES = _UxGT("自动开始"); // "Autostart" + LSTR MSG_ZPROBE_OUT = _UxGT("Z探针在热床之外"); // "Z probe out. bed" Z probe is not within the physical limits LSTR MSG_SKEW_FACTOR = _UxGT("偏斜因数"); // "Skew Factor" LSTR MSG_BLTOUCH = _UxGT("BLTouch"); // "BLTouch" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index 63e386a06f..7321252de7 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -49,7 +49,6 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_MAIN_MENU = _UxGT("主選單"); // "Main" LSTR MSG_ADVANCED_SETTINGS = _UxGT("進階設置"); // "Advanced Settings" LSTR MSG_CONFIGURATION = _UxGT("設置"); //Configuration - LSTR MSG_RUN_AUTO_FILES = _UxGT("自動開始"); // "Autostart" LSTR MSG_DISABLE_STEPPERS = _UxGT("關閉步進馬達"); // "Disable steppers" LSTR MSG_DEBUG_MENU = _UxGT("除錯選單"); // "Debug Menu" LSTR MSG_PROGRESS_BAR_TEST = _UxGT("進度條測試"); // "Progress Bar Test" @@ -350,14 +349,14 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_FILAMENTUNLOAD = _UxGT("卸載絲料"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_E = _UxGT("卸載絲料 *"); // "Unload filament" LSTR MSG_FILAMENTUNLOAD_ALL = _UxGT("卸載全部"); // "Unload All" - #if HAS_MULTI_VOLUME - LSTR MSG_ATTACH_SD_MEDIA = _UxGT("挂载記憶卡"); // "Attach SD Card" - LSTR MSG_ATTACH_USB_MEDIA = _UxGT("挂载隨身碟"); // "Attach USB Drive" - #else - LSTR MSG_ATTACH_MEDIA = _UxGT("連接記憶卡"); // "Attach Media" - #endif + + LSTR MSG_ATTACH_MEDIA = _UxGT("連接記憶卡"); // "Attach Media" + LSTR MSG_ATTACH_SD = _UxGT("挂载記憶卡"); // "Attach SD Card" + LSTR MSG_ATTACH_USB = _UxGT("挂载隨身碟"); // "Attach USB Drive" LSTR MSG_CHANGE_MEDIA = _UxGT("更換記憶卡"); // "Change SD card" LSTR MSG_RELEASE_MEDIA = _UxGT("釋放媒體"); // "Release Media" + LSTR MSG_RUN_AUTOFILES = _UxGT("自動開始"); // "Autostart" + LSTR MSG_ZPROBE_OUT = _UxGT("Z探針在熱床之外"); // "Z probe out. bed" Z probe is not within the physical limits LSTR MSG_SKEW_FACTOR = _UxGT("偏斜因數"); // "Skew Factor" diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 9509c72cc5..7e2d458e41 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -253,13 +253,13 @@ void menu_main() { if (card_detected) { if (!card_open) { #if ENABLED(MENU_ADDAUTOSTART) - ACTION_ITEM(MSG_RUN_AUTO_FILES, card.autofile_begin); // Run Auto Files + ACTION_ITEM(MSG_RUN_AUTOFILES, card.autofile_begin); // Run Auto Files #endif #if HAS_SD_DETECT GCODES_ITEM(MSG_CHANGE_MEDIA, F("M21" TERN_(HAS_MULTI_VOLUME, "S"))); // M21 Change Media #if HAS_MULTI_VOLUME - GCODES_ITEM(MSG_ATTACH_USB_MEDIA, F("M21U")); // M21 Attach USB Media + GCODES_ITEM(MSG_ATTACH_USB, F("M21U")); // M21 Attach USB Media #endif #else // - or - ACTION_ITEM(MSG_RELEASE_MEDIA, []{ // M22 Release Media @@ -279,8 +279,8 @@ void menu_main() { ACTION_ITEM(MSG_NO_MEDIA, nullptr); // "No Media" #else #if HAS_MULTI_VOLUME - GCODES_ITEM(MSG_ATTACH_SD_MEDIA, F("M21S")); // M21S Attach SD Card - GCODES_ITEM(MSG_ATTACH_USB_MEDIA, F("M21U")); // M21U Attach USB Media + GCODES_ITEM(MSG_ATTACH_SD, F("M21S")); // M21S Attach SD Card + GCODES_ITEM(MSG_ATTACH_USB, F("M21U")); // M21U Attach USB Media #else GCODES_ITEM(MSG_ATTACH_MEDIA, F("M21")); // M21 Attach Media #endif